Merge remote-tracking branch 'Aurora/master' into tensaitekina_aidoru…

…_sama

.github/ISSUE_TEMPLATE/BUG-REPORT.yaml

@@ -16,8 +16,6 @@ body:
     options:
       - label: I have searched the bug with a few keywords, and I confirm this bug was not yet reported.
         required: true
-      - label: The round I am reporting the bug from, or I am going to talk about, has already ended.
-        required: true
 
 - type: dropdown
   id: location

aurorastation.dme

@@ -2146,6 +2146,7 @@
 #include "code\modules\maps\planet_types\jungle.dm"
 #include "code\modules\maps\planet_types\lava.dm"
 #include "code\modules\maps\planet_types\snow.dm"
+#include "code\modules\maps\planet_types\lore\burzsia.dm"
 #include "code\modules\maps\planet_types\lore\srandmarr.dm"
 #include "code\modules\martial_arts\gunkata.dm"
 #include "code\modules\martial_arts\martial.dm"
@@ -2438,6 +2439,7 @@
 #include "code\modules\mob\living\silicon\robot\items\modules\robot_shield.dm"
 #include "code\modules\mob\living\silicon\robot\items\modules\sight.dm"
 #include "code\modules\mob\living\silicon\robot\items\upgrades\robot_upgrades.dm"
+#include "code\modules\mob\living\simple_animal\aquatic.dm"
 #include "code\modules\mob\living\simple_animal\bees.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
 #include "code\modules\mob\living\simple_animal\illusion.dm"
@@ -2457,12 +2459,14 @@
 #include "code\modules\mob\living\simple_animal\constructs\constructs\juggernaut.dm"
 #include "code\modules\mob\living\simple_animal\constructs\constructs\wraith.dm"
 #include "code\modules\mob\living\simple_animal\friendly\adhomai.dm"
+#include "code\modules\mob\living\simple_animal\friendly\capybara.dm"
 #include "code\modules\mob\living\simple_animal\friendly\carp.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cosmozoan.dm"
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
 #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
+#include "code\modules\mob\living\simple_animal\friendly\fish.dm"
 #include "code\modules\mob\living\simple_animal\friendly\fox.dm"
 #include "code\modules\mob\living\simple_animal\friendly\hakhma.dm"
 #include "code\modules\mob\living\simple_animal\friendly\lizard.dm"
@@ -2511,6 +2515,7 @@
 #include "code\modules\mob\living\simple_animal\hostile\hivebots\hivebot_harvester.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hivebots\hivebot_harvester_projectiles.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hivebots\hivebot_projectiles.dm"
+#include "code\modules\mob\living\simple_animal\hostile\retaliate\aquatic.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\cavern.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\exoplanet.dm"
@@ -2557,6 +2562,7 @@
 #include "code\modules\modular_computers\file_system\programs\command\account_database.dm"
 #include "code\modules\modular_computers\file_system\programs\command\card.dm"
 #include "code\modules\modular_computers\file_system\programs\command\command_and_communications.dm"
+#include "code\modules\modular_computers\file_system\programs\command\docks.dm"
 #include "code\modules\modular_computers\file_system\programs\command\teleporter.dm"
 #include "code\modules\modular_computers\file_system\programs\engineering\_engineering.dm"
 #include "code\modules\modular_computers\file_system\programs\engineering\atmoscontrol.dm"
@@ -3362,6 +3368,9 @@
 #include "maps\aurora\code\aurora_shuttles.dm"
 #include "maps\aurora\code\aurora_unittest.dm"
 #include "maps\away\away_sites.dm"
+#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station.dm"
+#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_areas.dm"
+#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_items.dm"
 #include "maps\away\away_site\abandoned_mining\cursed.dm"
 #include "maps\away\away_site\big_derelict\bigderelict.dm"
 #include "maps\away\away_site\blueriver\blueriver.dm"
@@ -3518,6 +3527,8 @@
 #include "maps\random_ruins\exoplanets\asteroid\asteroid.dm"
 #include "maps\random_ruins\exoplanets\asteroid\mystery_ship\mystery_ship_areas.dm"
 #include "maps\random_ruins\exoplanets\asteroid\old_outpost\old_outpost.dm"
+#include "maps\random_ruins\exoplanets\burzsia\burzsia_dead_ipc.dm"
+#include "maps\random_ruins\exoplanets\burzsia\burzsia_mining.dm"
 #include "maps\random_ruins\exoplanets\crashed_pod\crashed_pod.dm"
 #include "maps\random_ruins\exoplanets\desert\desert.dm"
 #include "maps\random_ruins\exoplanets\grove\grove.dm"

code/__defines/background.dm

@@ -92,6 +92,7 @@
 #define ACCENT_DOMINIA_FRONTIER "Imperial Frontier"
 #define ACCENT_DOMINIA_NOVIJADRAN "Novi Jadranic"
 #define ACCENT_DOMINIA_LYODII "Lyodii"
+#define ACCENT_DOMINIA_SUNREACH "Sun Reach"
 #define ACCENT_JUPITER "Jovian"
 #define ACCENT_CALLISTO "Callistean"
 #define ACCENT_EUROPA "Europan"
@@ -130,8 +131,8 @@
 #define ACCENT_HARRNRRI "Harr'nrri Siik'mas"
 #define ACCENT_ZARRJIRI "Zarr'jiri Siik'mas"
 
-#define ACCENT_HEGEMON_NOBLE "Noble Hegemonic"
-#define ACCENT_HEGEMON_PEASANT "Peasant Hegemonic"
+#define ACCENT_HEARTLAND_NOBLE "Izweski Heartland Noble"
+#define ACCENT_HEARTLAND_PEASANT "Izweski Heartland Peasant"
 #define ACCENT_TRAD_NOBLE "Noble Traditional"
 #define ACCENT_TRAD_PEASANT "Peasant Traditional"
 #define ACCENT_WASTELAND "Deep Wastelander"

code/__defines/space_sectors.dm

@@ -24,7 +24,8 @@
 #define SECTOR_WEEPING_STARS		"Weeping Stars"//Generic sector
 #define SECTOR_ARUSHA				"Arusha"//Generic sector
 #define SECTOR_LIBERTYS_CRADLE		"Liberty's Cradle"//Generic sector
-#define ALL_COALITION_SECTORS	list(SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_LIBERTYS_CRADLE, SECTOR_ARUSHA)
+#define SECTOR_BURZSIA				"Burzsia" //Burzsia I and II are here
+#define ALL_COALITION_SECTORS	list(SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_LIBERTYS_CRADLE, SECTOR_ARUSHA, SECTOR_BURZSIA)
 
 //Light's edge, which should have unique properties all around
 #define SECTOR_LIGHTS_EDGE			"Light's Edge"//For the area of Light's Edge that is somewhat inhabited
@@ -39,4 +40,4 @@
 //For sectors where corporate entities can or should appear. Corporate ships having this tag can be seen more reliably
 #define ALL_CORPORATE_SECTORS	list(ALL_TAU_CETI_SECTORS, SECTOR_SRANDMARR, SECTOR_UUEOAESA, ALL_COALITION_SECTORS, ALL_GENERIC_SECTORS, SECTOR_GAKAL, SECTOR_NRRAHRAHUL, SECTOR_BADLANDS)//Currently excludes Elyran sectors and Light's Edge
 
-#define ALL_POSSIBLE_SECTORS	list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_ARUSHA, SECTOR_LIBERTYS_CRADLE, SECTOR_LIGHTS_EDGE, SECTOR_LEMURIAN_SEA, SECTOR_STAR_NURSERY, SECTOR_GENERIC)
+#define ALL_POSSIBLE_SECTORS	list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_ARUSHA, SECTOR_BURZSIA, SECTOR_LIBERTYS_CRADLE, SECTOR_LIGHTS_EDGE, SECTOR_LEMURIAN_SEA, SECTOR_STAR_NURSERY, SECTOR_GENERIC)

code/datums/uplink/gear loadout.dm

@@ -94,3 +94,47 @@
 	name = "Einstein Engines Assets (Single)"
 	path = /obj/structure/closet/crate/secure/gear_loadout/einstein/single
 	telecrystal_cost = 10
+
+/datum/uplink_item/item/gear_loadout/izweski
+	name = "Izweski Hegemony Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits are only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/hegemony
+
+/datum/uplink_item/item/gear_loadout/izweski_single
+	name = "Izweski Hegemony Assets (Single)"
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/hegemony/single
+	telecrystal_cost = 10
+
+/datum/uplink_item/item/gear_loadout/kataphract
+	name = "Kataphract Knight Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits and hardsuit are only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/kataphract
+
+/datum/uplink_item/item/gear_loadout/kataphract_single
+	name = "Kataphract Knight Assets (Single)"
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/kataphract/single
+	telecrystal_cost = 10
+
+/datum/uplink_item/item/gear_loadout/izharshan
+	name = "Izharshan's Raiders Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits are only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/izharshan
+
+/datum/uplink_item/item/gear_loadout/izharshan_single
+	name = "Izharshan's Raiders Assets (Single)"
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by Unathi."
+	path = /obj/structure/closet/crate/secure/gear_loadout/izharshan/single
+	telecrystal_cost = 10
+
+/datum/uplink_item/item/gear_loadout/pvsm
+	name = "People's Volunteer Spacer Militia Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits are only usable by Tajara."
+	path = /obj/structure/closet/crate/secure/gear_loadout/pvsm
+
+/datum/uplink_item/item/gear_loadout/pvsm_single
+	name = "People's Volunteer Spacer Militia Assets (Single)"
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by Tajara."
+	path = /obj/structure/closet/crate/secure/gear_loadout/pvsm/single
+	telecrystal_cost = 10

code/game/atoms.dm

@@ -130,9 +130,16 @@
 		return 1
 	return
 
-// Checks if user can use this object. Set use_flags to customize what checks are done.
-// Returns 0 if they can use it, a value representing why they can't if not.
-// Flags are in "code/__defines/misc.dm".
+
+/**
+ * Checks if user can use this object. Set use_flags to customize what checks are done
+ * Returns 0 (FALSE) if they can use it, a value representing why they can't if not
+ * See `code\__defines\misc.dm` for the list of flags and return codes
+ *
+ * * user - The `mob` to check against, if it can perform said use
+ * * use_flags - The flags to modify the check behavior, eg. `USE_ALLOW_NON_ADJACENT`, see `code\__defines\misc.dm` for the list of flags
+ * * show_messages - A boolean, to indicate if a feedback message should be shown, about the reason why someone can't use the atom
+ */
 /atom/proc/use_check(mob/user, use_flags = 0, show_messages = FALSE)
 	. = USE_SUCCESS
 	if(NOT_FLAG(use_flags, USE_ALLOW_NONLIVING) && !isliving(user)) // No message for ghosts.
@@ -173,6 +180,14 @@
 			to_chat(user, SPAN_NOTICE("You need to be holding [src] to do that."))
 		return USE_FAIL_NOT_IN_USER
 
+/**
+ * Checks if a mob can use an atom, message the user if not with an appropriate reason
+ * Returns 0 (FALSE) if they can use it, a value representing why they can't if not
+ * See `code\__defines\misc.dm` for the list of flags and return codes
+ *
+ * * user - The `mob` to check against, if it can perform said use
+ * * use_flags - The flags to modify the check behavior, eg. `USE_ALLOW_NON_ADJACENT`, see `code\__defines\misc.dm` for the list of flags
+ */
 /atom/proc/use_check_and_message(mob/user, use_flags = 0)
 	. = use_check(user, use_flags, TRUE)
 

code/game/machinery/Sleeper.dm

@@ -171,9 +171,10 @@
 	else
 		data["occupant"] = FALSE
 	if(beaker)
-		data["beaker"] = REAGENTS_FREE_SPACE(beaker.reagents)
+		data["beaker"] = TRUE
+		data["beakerfreespace"] = REAGENTS_FREE_SPACE(beaker.reagents)
 	else
-		data["beaker"] = -1
+		data["beaker"] = FALSE
 	data["filtering"] = filtering
 	data["pump"] = pump
 

code/game/machinery/computer/Operating.dm

@@ -64,6 +64,12 @@
 			to_chat(usr, SPAN_NOTICE("You try to insert \the [O], but \the [src] buzzes. There is already a [O] inside!"))
 			playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
 			return TRUE
+
+		if(O.name != "Scan ([victim])")
+			to_chat(usr, SPAN_NOTICE("This scan is of a different patient! Please insert the scan of the correct patient."))
+			playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
+			return TRUE
+
 		user.drop_from_inventory(O, src)
 		input_scan = O
 		input_scan.color = "#272727"

code/game/machinery/doors/firedoor.dm

@@ -504,6 +504,11 @@
 /obj/machinery/door/firedoor/noid
 	req_one_access = null
 
+/obj/machinery/door/firedoor/noid/closed
+	req_one_access = null
+	icon_state = "door_closed"
+	density = 1
+
 //These are playing merry hell on ZAS.  Sorry fellas :(
 
 /*/obj/machinery/door/firedoor/border_only

code/game/machinery/vending_types.dm

@@ -98,6 +98,11 @@
 		/obj/item/reagent_containers/food/drinks/bottle/space_up = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = 2,
 		/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/dominian_wine = 2,
+		/obj/item/reagent_containers/food/drinks/bottle/algae_wine = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/kvass = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/tarasun = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/valokki_wine = 3,
 		/obj/item/reagent_containers/food/drinks/cans/grape_juice = 6,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2,
 		/obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
@@ -176,6 +181,29 @@
 	req_access = list()
 	restock_items = 1
 
+/obj/machinery/vending/boozeomat/abandoned
+	// badly stocked, with trash, junk, etc
+	desc = "Used to hold bottles and drinks cold and nice in the past, now it is all dusty and barely functioning, if at all."
+	products = list(
+		/obj/item/reagent_containers/food/drinks/drinkingglass = 1,
+		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 5,
+		/obj/item/reagent_containers/food/drinks/ice = 1,
+		/obj/item/reagent_containers/food/drinks/bottle/whiskey = 2,
+		/obj/item/reagent_containers/food/drinks/bottle/tequila = 1,
+		/obj/item/reagent_containers/food/drinks/bottle/vodka = 2,
+		/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
+		/obj/item/reagent_containers/food/drinks/bottle/wine = 1,
+		/obj/item/reagent_containers/food/drinks/bottle/victorygin = 1,
+		/obj/item/reagent_containers/food/drinks/bottle/small/beer = 2,
+		/obj/item/reagent_containers/food/drinks/bottle = 6,
+		/obj/random/junk = 7,
+		/obj/item/material/shard = 3,
+		/obj/item/broken_bottle = 5)
+	random_itemcount = 1
+	req_access = list()
+	restock_items = 1
+	use_power = 0
+
 /obj/machinery/vending/assist
 	vend_id = "tools"
 	icon_state = "generic"

code/game/objects/items.dm

@@ -70,6 +70,8 @@
 	var/worn_overlay = null // used similarly as above, except for inhands.
 	var/worn_overlay_color = null // When you want your worn overlay to have colors. So you can have more than one modular coloring.
 	var/alpha_mask // when you want to slice out a chunk from a sprite
+	var/has_accents = FALSE // determines whether accent colour is applied or not
+	var/accent_color = COLOR_GRAY // used for accents which are coloured differently to the main body of the sprite
 
 	//ITEM_ICONS ARE DEPRECATED. USE CONTAINED SPRITES IN FUTURE
 	// Used to specify the icon file to be used when the item is worn. If not set the default icon for that slot will be used.
@@ -126,8 +128,9 @@
 /obj/item/update_icon()
 	. = ..()
 	if(build_from_parts)
-		cut_overlays()
 		add_overlay(overlay_image(icon,"[icon_state]_[worn_overlay]", flags=RESET_COLOR)) //add the overlay w/o coloration of the original sprite
+	if(accent_color && has_accents)
+		add_overlay(overlay_image(icon,"[icon_state]_acc",accent_color, RESET_COLOR))
 
 /obj/item/device
 	icon = 'icons/obj/device.dmi'

code/game/objects/items/airbubble.dm

@@ -485,8 +485,8 @@
 	else
 		return attack_hand(user)
 
-/obj/structure/closet/airbubble/store_mobs(var/stored_units)
-	contains_body = ..()
+/obj/structure/closet/airbubble/store_mobs(var/stored_units, var/mob_limit)
+	contains_body = ..(stored_units, mob_limit = TRUE)
 	return contains_body
 
 /obj/structure/closet/airbubble/update_icon()

code/game/objects/items/bodybag.dm

@@ -53,7 +53,7 @@
 	icon_state = "bodybag"
 	open_sound = 'sound/items/zip.ogg'
 	close_sound = 'sound/items/zip.ogg'
-	density = 0
+	density = FALSE
 	storage_capacity = 30
 	var/item_path = /obj/item/bodybag
 	var/contains_body = FALSE
@@ -95,8 +95,8 @@
 		LAZYREMOVE(overlays, image(icon, "bodybag_label"))
 		return TRUE
 
-/obj/structure/closet/body_bag/store_mobs(var/stored_units)
-	contains_body = ..()
+/obj/structure/closet/body_bag/store_mobs(var/stored_units, var/mob_limit)
+	contains_body = ..(stored_units, mob_limit = TRUE)
 	slowdown = 0
 	if(contains_body)
 		for(var/mob/living/M in contents)

code/game/objects/items/defib.dm

@@ -17,7 +17,7 @@
 	action_button_name = "Toggle Paddles"
 
 	var/obj/item/shockpaddles/linked/paddles
-	var/obj/item/cell/bcell = null
+	var/obj/item/cell/bcell
 
 /obj/item/defibrillator/Initialize() //starts without a cell for rnd
 	. = ..()
@@ -120,7 +120,7 @@
 		reattach_paddles(user)
 	else if(istype(W, /obj/item/cell))
 		if(bcell)
-			to_chat(user, SPAN_NOTICE("\the [src] already has a cell."))
+			to_chat(user, SPAN_NOTICE("\The [src] already has a cell."))
 		else
 			if(!user.unEquip(W))
 				return
@@ -251,15 +251,20 @@
 		playsound(src, 'sound/machines/defib_ready.ogg', 50, 0)
 
 /obj/item/shockpaddles/proc/wield()
-	var/mob/living/M = loc
-	if(istype(M) && !wielded)
-		wielded = TRUE
-		name = "[initial(name)] (wielded)"
-		var/obj/item/offhand/O = new(M)
-		O.name = "[initial(name)] - offhand"
-		O.desc = "The second set of paddles."
-		M.put_in_inactive_hand(O)
-		update_icon()
+	var/mob/living/carbon/human/M = loc
+	if(istype(M))
+		var/obj/A = M.get_inactive_hand()
+		if(A)
+			to_chat(M, SPAN_WARNING("Your other hand is occupied!"))
+			return
+		if(!wielded)
+			wielded = TRUE
+			name = "[initial(name)] (wielded)"
+			var/obj/item/offhand/O = new(M)
+			O.name = "[initial(name)] - offhand"
+			O.desc = "The second set of paddles."
+			M.put_in_inactive_hand(O)
+			update_icon()
 
 /obj/item/shockpaddles/proc/unwield()
 	wielded = FALSE
@@ -598,7 +603,7 @@
 /obj/item/shockpaddles/linked/equipped(mob/user, slot, assisted_equip)
 	. = ..()
 	if(ismob(loc))
-		RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(unlatch))
+		RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(unlatch), TRUE)
 
 /obj/item/shockpaddles/linked/proc/unlatch()
 	if(get_dist(loc, base_unit) > 1)

code/game/objects/items/devices/lighting/lamp.dm

@@ -18,6 +18,8 @@
 	toggle_sound = /singleton/sound_category/switch_sound
 	activation_sound = 'sound/effects/lighton.ogg'
 
+/obj/item/device/flashlight/lamp/off
+	on = FALSE
 
 // green-shaded desk lamp
 /obj/item/device/flashlight/lamp/green