Merge branch 'master' into clicks_refactor

.github/workflows/byond.yml

@@ -195,13 +195,23 @@ jobs:
       - name: Set ENV variables
         run: bash dependencies.sh
 
-      - name: Download OpenDream Compiler
+      #Setup the .NET dependency to what is needed by OpenDream
+      - name: Setup DotNet Dependency
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100
+
+      #Prepare the precompiled OpenDream compiler
+      - name: Prepare OpenDream Compiler
         run: |
-          bash tools/ci/install_od.sh
+          cd $HOME
+          wget -v https://github.com/OpenDreamProject/OpenDream/releases/download/latest/DMCompiler_linux-x64.tar.gz
+          tar -xf DMCompiler_linux-x64.tar.gz
 
+      #Run OpenDream on the DME
       - name: Run OpenDream
         run: |
-          tools/ci/run_od.sh
+          dotnet $HOME/DMCompiler_linux-x64/DMCompiler.dll --suppress-unimplemented aurorastation.dme
 
 ###########################################
 ############### TGUI LINTING ##############

code/datums/wires/airlock.dm

@@ -32,10 +32,6 @@
 	if(!..())
 		return FALSE
 	var/obj/machinery/door/airlock/A = holder
-	if(!istype(user, /mob/living/silicon))
-		if(A.isElectrified())
-			if(A.shock(user, 100))
-				return FALSE
 	if(!A.p_open)
 		return FALSE
 	return TRUE
@@ -137,7 +133,7 @@
 			A.update_icon()
 
 
-/datum/wires/airlock/on_pulse(wire)
+/datum/wires/airlock/on_pulse(wire, user)
 
 	var/obj/machinery/door/airlock/A = holder
 	switch(wire)
@@ -170,6 +166,8 @@
 
 		if(WIRE_SHOCK)
 			//one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds.
+			if(ismob(user))
+				A.shock(user, 100)
 			A.electrify(30)
 
 		if(WIRE_OPEN)

code/datums/wires/smartfridge.dm

@@ -20,10 +20,6 @@
 	if(!..())
 		return FALSE
 	var/obj/machinery/smartfridge/S = holder
-	if(!istype(user, /mob/living/silicon))
-		if(S.seconds_electrified)
-			if(S.shock(user, 100))
-				return FALSE
 	if(S.panel_open)
 		return TRUE
 	return FALSE
@@ -37,12 +33,14 @@
 	. += "The cyan light is [S.cooling ? "on" : "off"]."
 	. += "The blue light is [S.heating ? "on" : "off"]."
 
-/datum/wires/smartfridge/on_pulse(wire)
+/datum/wires/smartfridge/on_pulse(wire, user)
 	var/obj/machinery/smartfridge/S = holder
 	switch(wire)
 		if(WIRE_THROW)
 			S.shoot_inventory = !S.shoot_inventory
 		if(WIRE_SHOCK)
+			if(ismob(user))
+				S.shock(user, 100)
 			S.seconds_electrified = 30
 		if(WIRE_IDSCAN)
 			S.scan_id = !S.scan_id

code/datums/wires/suit_storage_unit.dm

@@ -15,10 +15,6 @@
 	if(!..())
 		return FALSE
 	var/obj/machinery/suit_cycler/S = holder
-	if(!istype(user, /mob/living/silicon))
-		if(S.electrified)
-			if(S.shock(user, 100))
-				return FALSE
 	if(S.panel_open)
 		return TRUE
 	return FALSE
@@ -30,12 +26,14 @@
 	. += "The red light is [S.safeties ? "off" : "blinking"]."
 	. += "The yellow light is [S.locked ? "on" : "off"]."
 
-/datum/wires/suit_storage_unit/on_pulse(wire)
+/datum/wires/suit_storage_unit/on_pulse(wire, user)
 	var/obj/machinery/suit_cycler/S = holder
 	switch(wire)
 		if(WIRE_SAFETY)
 			S.safeties = !S.safeties
 		if(WIRE_SHOCK)
+			if(ismob(user))
+				S.shock(user, 50)
 			S.electrified = 30
 		if(WIRE_LOCKDOWN)
 			S.locked = !S.locked

code/datums/wires/vending.dm

@@ -20,10 +20,6 @@
 	if(!..())
 		return FALSE
 	var/obj/machinery/vending/V = holder
-	if(!istype(user, /mob/living/silicon))
-		if(V.seconds_electrified)
-			if(V.shock(user, 100))
-				return FALSE
 	if(V.panel_open)
 		return TRUE
 	return FALSE
@@ -38,14 +34,16 @@
 	. += "The cyan light is [V.temperature_setting == -1 ? "on" : "off"]."
 	. += "The blue light is [V.temperature_setting == 1 ? "on" : "off"]."
 
-/datum/wires/vending/on_pulse(wire)
+/datum/wires/vending/on_pulse(wire, user)
 	var/obj/machinery/vending/V = holder
 	switch(wire)
 		if(WIRE_THROW)
 			V.shoot_inventory = !V.shoot_inventory
 		if(WIRE_CONTRABAND)
 			V.categories ^= CAT_HIDDEN
 		if(WIRE_SHOCK)
+			if(ismob(user))
+				V.shock(user, 50)
 			V.seconds_electrified = 30
 		if(WIRE_IDSCAN)
 			V.scan_id = !V.scan_id

code/game/jobs/faction/hephaestus.dm

@@ -49,6 +49,7 @@
 		"Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/hephaestus,
 		"Corporate Reporter" = /obj/outfit/job/journalist/hephaestus,
 		"Corporate Liaison" = /obj/outfit/job/representative/hephaestus,
+		"Assistant" = /obj/outfit/job/assistant/hephaestus,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/hephaestus,
 		"Engineering Personnel" = /obj/outfit/job/engineer/event/hephaestus,
 		"Operations Personnel" = /obj/outfit/job/hangar_tech/event/hephaestus
@@ -167,6 +168,13 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/heph
 	messengerbag_faction = /obj/item/storage/backpack/messenger/heph
 
+/obj/outfit/job/assistant/hephaestus
+	name = "Assistant - Hephaestus"
+
+	backpack_faction = /obj/item/storage/backpack/heph
+	satchel_faction = /obj/item/storage/backpack/satchel/heph
+	dufflebag_faction = /obj/item/storage/backpack/duffel/heph
+	messengerbag_faction = /obj/item/storage/backpack/messenger/heph
 
 /obj/outfit/job/visitor/hephaestus
 	name = "Off-Duty Crew Member - Hephaestus"

code/game/jobs/faction/idris.dm

@@ -62,6 +62,7 @@
 		"Corporate Reporter" = /obj/outfit/job/journalist/idris,
 		"Chaplain" = /obj/outfit/job/chaplain/idris,
 		"Corporate Liaison" = /obj/outfit/job/representative/idris,
+		"Assistant" = /obj/outfit/job/assistant/idris,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/idris,
 		"Security Personnel" = /obj/outfit/job/officer/event/idris,
 		"Service Personnel" = /obj/outfit/job/bartender/idris
@@ -246,6 +247,14 @@
 		/obj/item/stamp/idris = 1
 	)
 
+/obj/outfit/job/assistant/idris
+	name = "Assistant - Idris"
+
+	backpack_faction = /obj/item/storage/backpack/idris
+	satchel_faction = /obj/item/storage/backpack/satchel/idris
+	dufflebag_faction = /obj/item/storage/backpack/duffel/idris
+	messengerbag_faction = /obj/item/storage/backpack/messenger/idris
+
 /obj/outfit/job/visitor/idris
 	name = "Off-Duty Crew Member - Idris"
 

code/game/jobs/faction/orion_express.dm

@@ -51,6 +51,7 @@
 		"Corporate Reporter" = /obj/outfit/job/journalist/orion,
 		"Chaplain" = /obj/outfit/job/chaplain/orion,
 		"Corporate Liaison" = /obj/outfit/job/representative/orion,
+		"Assistant" = /obj/outfit/job/assistant/orion,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/orion,
 		"Operations Personnel" = /obj/outfit/job/hangar_tech/event/orion,
 		"Service Personnel" = /obj/outfit/job/bartender/orion
@@ -203,6 +204,14 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
 	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
 
+/obj/outfit/job/assistant/orion
+	name = "Assistant - Orion"
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
 /obj/outfit/job/visitor/orion
 	name = "Off-Duty Crew Member - Orion Express"
 

code/game/jobs/faction/pmc.dm

@@ -50,6 +50,7 @@
 		"Medical Intern" = /obj/outfit/job/intern_med/pmc,
 		"Corporate Reporter" = /obj/outfit/job/journalist/pmc,
 		"Corporate Liaison" = /obj/outfit/job/representative/pmc,
+		"Assistant" = /obj/outfit/job/assistant/pmc,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/pmc,
 		"Security Personnel" = /obj/outfit/job/officer/event/pmc,
 		"Medical Personnel" = /obj/outfit/job/med_tech/event/pmc
@@ -220,6 +221,14 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
 	messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
 
+/obj/outfit/job/assistant/pmc
+	name = "Assistant - PMC"
+
+	backpack_faction = /obj/item/storage/backpack/pmcg
+	satchel_faction = /obj/item/storage/backpack/satchel/pmcg
+	dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg
+	messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg
+
 /obj/outfit/job/visitor/pmc
 	name = "Off-Duty Crew Member - PMC"
 

code/game/jobs/faction/zavodskoi.dm

@@ -65,6 +65,7 @@
 		"Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/zavodskoi,
 		"Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi,
 		"Corporate Liaison" = /obj/outfit/job/representative/zavodskoi,
+		"Assistant" = /obj/outfit/job/assistant/zavodskoi,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/zavodskoi,
 		"Security Personnel" = /obj/outfit/job/officer/event/zavodskoi,
 		"Engineering Personnel" = /obj/outfit/job/engineer/event/zavodskoi,
@@ -282,6 +283,14 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
 	messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
 
+/obj/outfit/job/assistant/zavodskoi
+	name = "Assistant - Zavodskoi Interstellar"
+
+	backpack_faction = /obj/item/storage/backpack/zavod
+	satchel_faction = /obj/item/storage/backpack/satchel/zavod
+	dufflebag_faction = /obj/item/storage/backpack/duffel/zavod
+	messengerbag_faction = /obj/item/storage/backpack/messenger/zavod
+
 /obj/outfit/job/visitor/zavodskoi
 	name = "Off-Duty Crew Member - Zavodskoi Interstellar"
 

code/game/jobs/faction/zeng_hu.dm

@@ -57,6 +57,7 @@
 		"Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zeng_hu,
 		"Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu,
 		"Corporate Liaison" = /obj/outfit/job/representative/zeng_hu,
+		"Assistant" = /obj/outfit/job/assistant/zeng_hu,
 		"Off-Duty Crew Member" = /obj/outfit/job/visitor/zeng_hu,
 		"Science Personnel" = /obj/outfit/job/scientist/event/zeng_hu,
 		"Medical Personnel" = /obj/outfit/job/med_tech/event/zeng_hu
@@ -251,6 +252,16 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
 	messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
 
+/obj/outfit/job/assistant/zeng_hu
+	name = "Assistant - Zeng-Hu"
+
+	id = /obj/item/card/id/zeng_hu
+
+	backpack_faction = /obj/item/storage/backpack/zeng
+	satchel_faction = /obj/item/storage/backpack/satchel/zeng
+	dufflebag_faction = /obj/item/storage/backpack/duffel/zeng
+	messengerbag_faction = /obj/item/storage/backpack/messenger/zeng
+
 /obj/outfit/job/visitor/zeng_hu
 	name = "Off-Duty Crew Member - Zeng-Hu"
 

code/game/jobs/job/ship_crew.dm

@@ -28,6 +28,11 @@
 	uniform = /obj/item/clothing/under/color/grey
 	shoes = /obj/item/clothing/shoes/sneakers/black
 
+	backpack_faction = /obj/item/storage/backpack/nt
+	satchel_faction = /obj/item/storage/backpack/satchel/nt
+	dufflebag_faction = /obj/item/storage/backpack/duffel/nt
+	messengerbag_faction = /obj/item/storage/backpack/messenger/nt
+
 /datum/job/visitor
 	title = "Off-Duty Crew Member"
 	flag = VISITOR

code/game/machinery/biogenerator.dm

@@ -50,6 +50,11 @@
 	name = "Synthetic Meat"
 	object = /obj/item/reagent_containers/food/snacks/meat/syntiflesh
 
+/singleton/biorecipe/food/slimymeat
+	name = "Slimy Meat"
+	object = /obj/item/reagent_containers/food/snacks/fish/mollusc
+	cost = 75
+
 /singleton/biorecipe/food/soywafers
 	name = "Soy Wafers"
 	object = /obj/item/reagent_containers/food/snacks/soywafers

code/game/objects/items/toys.dm

@@ -1143,7 +1143,7 @@
 /obj/item/toy/plushie/ipc
 	name = "Aphy plushie"
 	desc = "A plushie of an old Hephaestus mascot, Aphy."
-	desc_extended = "Aphy, a play on the name Aphrodite, was Hephaestus Industries' first baseline prototype. While the original Aphy is on display in Hephaestus' Mars headquarters, the unit has become a cutesy mascot in recent years."
+	desc_extended = "Aphy, a play on the name Aphrodite, was Hephaestus Industries' first baseline prototype. The original Aphy was tragically lost alongside Hephaestus' Mars headquarters during the Violet Dawn disaster, but the unit lives on as a cutesy, marketable mascot."
 	icon_state = "ipcplushie"
 	phrase = "Bwoop!"
 

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -63,6 +63,8 @@
 		if ("purple")
 			new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
 			new /obj/item/clothing/head/surgery/zeng(src)
+	new /obj/item/clothing/suit/storage/hooded/tajaran/surgery(src)
+	new /obj/item/storage/box/gloves(src)
 	new /obj/item/clothing/accessory/storage/white_vest(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/pmc(src)

code/modules/background/accent/diona.dm

@@ -66,7 +66,7 @@
 //Skrell influenced Accents
 /datum/accent/wavesong
 	name = ACCENT_WAVESONG
-	description = "A variant of Rootsong originating from Diona born on Skrellian worlds, Wavesong is considered the general accent for Dionae hailing from the Nralakk Federation. While it shares many similarities with Rootsong, Wavesong sets itself apart by having a lower pitch and more drawn-out tempo in comparison. While not considered mandatory, many Dionae living in the Federation will adopt the accent due to it being generally more favored by the Federation, often granting those with the accent a higher social credit score."
+	description = "A variant of Rootsong originating from Diona born on Skrellian worlds, Wavesong is considered the general accent for Dionae hailing from the Nralakk Federation. While it shares many similarities with Rootsong, Wavesong sets itself apart by having a lower pitch and more drawn-out tempo in comparison. While not considered mandatory, many Dionae living in the Federation will adopt the accent due to it being generally more favored by the Federation, often granting those with the accent a higher index rating."
 	tag_icon = "dionae_wavesong"
 	text_tag = "WAS"
 

code/modules/background/citizenship/skrell.dm

@@ -67,13 +67,13 @@
 		if(REPRESENTATIVE_MISSION_MEDIUM)
 			if(isvaurca(H))
 				rep_objectives = pick("Legally curtail the advancements and liberal thinking towards synthetics.",
-								"Remind C'thur Vaurcae aboard the [SSatlas.current_map.station_name] that they are representative of their hive-cell, and encourage them to increase their social credit",
+								"Remind C'thur Vaurcae aboard the [SSatlas.current_map.station_name] that they are representative of their hive-cell, and encourage them to increase their index rating",
 								"Ensure the interests of Federation citizens are upheld by the vessel - whether Skrell, C'thur or Diona.")
 			else
 				rep_objectives = pick("Ensure the interests of Federation citizens are upheld by the vessel. This includes C'thur and Diona of Federation origin",
 								"Legally curtail the advancements and liberal thinking towards synthetics.",
 								"The [SSatlas.current_map.station_name] hosts some of the brightest minds in the galaxy; winning them over towards the Federation is a major victory",
-								"Encourage Federation citizens with low social credit to work to increase their score.")
+								"Encourage Federation citizens with low index rating to work to increase their rating.")
 		else
 			if(isvaurca(H))
 				rep_objectives = pick("Consider assisting crew within the capacity of your role, an altruistic image is good PR towards both the Federation and the C'thur Hive.",
@@ -106,7 +106,7 @@
 			H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/cthur(H), slot_wear_suit)
 			H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
-			H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
+			H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Federation Ta Consulars get a Thermic Blaster.
 		else
 			H.equip_to_slot_or_del(new /obj/item/gun/energy/fedpistol/nopsi(H), slot_belt)
 		if(!visualsOnly)

code/modules/background/citizenship/unathi.dm

@@ -91,7 +91,6 @@
 
 	uniform = /obj/item/clothing/under/unathi
 	backpack_contents = list(/obj/item/device/camera = 1)
-	belt = /obj/item/gun/energy/pistol/hegemony
 
 /obj/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H)
@@ -102,8 +101,10 @@
 			H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit)
 			H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
+			H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Hegemony Ta Consulars get a Thermic Blaster.
 		else
 			H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit)
+			H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol/hegemony(H), slot_belt)
 		if(!visualsOnly)
 			addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
 	return TRUE