Merge branch 'master' into Command-Area-Remake

cmss13-devs · Aug 27, 2023 · 90f02e0 · 90f02e0
2 parents 1a8c06e + 0bac509
commit 90f02e0
Show file tree

Hide file tree

Showing 18 changed files with 13,227 additions and 13,187 deletions.
diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm
@@ -8,12 +8,19 @@
 /datum/game_mode
 	var/list/datum/emergency_call/all_calls = list() //initialized at round start and stores the datums.
 	var/datum/emergency_call/picked_calls[] = list() //Which distress calls are currently active
+	var/ert_dispatched = FALSE
 
 /datum/game_mode/proc/ares_online()
 	var/name = "ARES Online"
 	var/input = "ARES. Online. Good morning, marines."
 	shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg')
 
+/datum/game_mode/proc/request_ert(user, ares = FALSE)
+	if(!user)
+		return FALSE
+	message_admins("[key_name(user)] has requested a Distress Beacon! [ares ? SPAN_ORANGE("(via ARES)") : ""] ([SSticker.mode.ert_dispatched ? SPAN_RED("A random ERT was dispatched previously.") : SPAN_GREEN("No previous random ERT dispatched.")]) [CC_MARK(user)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[user]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[user]'>DENY</A>) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]")
+	return TRUE
+
 //The distress call parent. Cannot be called itself due to "name" being a filtered target.
 /datum/emergency_call
 	var/name = "name"
@@ -106,6 +113,7 @@
 			give_action(M, /datum/action/join_ert, src)
 
 /datum/game_mode/proc/activate_distress()
+	ert_dispatched = TRUE
 	var/datum/emergency_call/random_call = get_random_call()
 	if(!istype(random_call, /datum/emergency_call)) //Something went horribly wrong
 		return

diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm
@@ -563,7 +563,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
 			for(var/client/admin in GLOB.admins)
 				if((R_ADMIN|R_MOD) & admin.admin_holder.rights)
 					playsound_client(admin,'sound/effects/sos-morse-code.ogg',10)
-			message_admins("[key_name(usr)] has requested a Distress Beacon (via ARES)! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[usr]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+			SSticker.mode.request_ert(usr, TRUE)
 			to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command."))
 			COOLDOWN_START(src, ares_distress_cooldown, COOLDOWN_COMM_REQUEST)
 			return TRUE

diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm
@@ -11,11 +11,11 @@
 	/// requesting a distress beacon
 	COOLDOWN_DECLARE(cooldown_request)
 	/// requesting evac
-	COOLDOWN_DECLARE(cooldown_destruct) 
+	COOLDOWN_DECLARE(cooldown_destruct)
 	/// messaging HC (admins)
 	COOLDOWN_DECLARE(cooldown_central)
 	/// making a ship announcement
-	COOLDOWN_DECLARE(cooldown_message) 
+	COOLDOWN_DECLARE(cooldown_message)
 
 	var/list/messagetitle = list()
 	var/list/messagetext = list()
@@ -230,7 +230,7 @@
 			for(var/client/admin_client as anything in GLOB.admins)
 				if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
 					admin_client << 'sound/effects/sos-morse-code.ogg'
-			message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[usr]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+			SSticker.mode.request_ert(usr)
 			to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
 
 			COOLDOWN_START(src, cooldown_request, COOLDOWN_COMM_REQUEST)

diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
@@ -200,7 +200,7 @@
 				for(var/client/C in GLOB.admins)
 					if((R_ADMIN|R_MOD) & C.admin_holder.rights)
 						C << 'sound/effects/sos-morse-code.ogg'
-				message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[usr]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+				SSticker.mode.request_ert(usr)
 				to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
 
 				cooldown_request = world.time

diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm
@@ -160,7 +160,7 @@
 			for(var/client/C in GLOB.admins)
 				if((R_ADMIN|R_MOD) & C.admin_holder.rights)
 					playsound_client(C,'sound/effects/sos-morse-code.ogg',10)
-			message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[usr]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
+			SSticker.mode.request_ert(usr)
 			to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
 			COOLDOWN_START(src, distress_cooldown, COOLDOWN_COMM_REQUEST)
 			return TRUE

diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -906,6 +906,9 @@
 		update_icon()
 
 /obj/item/storage/pouch/pressurized_reagent_canister/afterattack(obj/target, mob/user, flag) //refuel at fueltanks & chem dispensers.
+	if(get_dist(user,target) > 1)
+		return ..()
+
 	if(!inner)
 		to_chat(user, SPAN_WARNING("[src] has no internal container!"))
 		return ..()
@@ -925,8 +928,7 @@
 	if(!istype(target, /obj/structure/reagent_dispensers/fueltank))
 		return ..()
 
-	if(get_dist(user,target) > 1)
-		return ..()
+
 
 	var/obj/O = target
 	if(!O.reagents || O.reagents.reagent_list.len < 1)

diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm
@@ -539,8 +539,7 @@
 
 		// Bookkeeping.
 		check_level_sanity()
-		force_update = 1
-		process()
+
 
 		return
 

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -1343,10 +1343,11 @@ and you're good to go.
 
 	//The following relating to bursts was borrowed from Fire code.
 	var/check_for_attachment_fire = FALSE
-	if(active_attachable?.flags_attach_features & ATTACH_PROJECTILE)
-		check_for_attachment_fire = TRUE
-	else
-		active_attachable.activate_attachment(src, null, TRUE)//No way.
+	if(active_attachable)
+		if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
+			check_for_attachment_fire = TRUE
+		else
+			active_attachable.activate_attachment(src, null, TRUE)//No way.
 
 
 	var/bullets_to_fire = 1

diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
@@ -567,7 +567,7 @@
 
 
 /obj/item/weapon/gun/rifle/m4ra_custom/set_gun_attachment_offsets()
-	attachable_offset = list("muzzle_x" = 43, "muzzle_y" = 17,"rail_x" = 23, "rail_y" = 21, "under_x" = 30, "under_y" = 11, "stock_x" = 24, "stock_y" = 13, "special_x" = 39, "special_y" = 17)
+	attachable_offset = list("muzzle_x" = 43, "muzzle_y" = 17,"rail_x" = 23, "rail_y" = 21, "under_x" = 30, "under_y" = 11, "stock_x" = 24, "stock_y" = 13, "special_x" = 37, "special_y" = 16)
 
 /obj/item/weapon/gun/rifle/m4ra_custom/set_gun_config_values()
 	..()

diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm
@@ -235,6 +235,7 @@
 	if(HAS_TRAIT(attacking_object, TRAIT_TOOL_WRENCH))
 		if(!wrenchable)
 			to_chat(user, "[src] cannot be unwrenched.")
+			return
 
 		if(!do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
 			return

diff --git a/html/changelogs/AutoChangeLog-pr-4258.yml b/html/changelogs/AutoChangeLog-pr-4258.yml
@@ -0,0 +1,4 @@
+author: "MikeKuwait"
+delete-after: True
+changes:
+  - bugfix: "teleporting canister pouch to chemical dispenser"
diff --git a/html/changelogs/AutoChangeLog-pr-4259.yml b/html/changelogs/AutoChangeLog-pr-4259.yml
@@ -0,0 +1,4 @@
+author: "MikeKuwait"
+delete-after: True
+changes:
+  - bugfix: "Plants should not grow every time it's sampled"
diff --git a/html/changelogs/AutoChangeLog-pr-4261.yml b/html/changelogs/AutoChangeLog-pr-4261.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "Fixed pointblanks"
diff --git a/html/changelogs/AutoChangeLog-pr-4264.yml b/html/changelogs/AutoChangeLog-pr-4264.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "Fixed western medbay door buttons"
diff --git a/html/changelogs/AutoChangeLog-pr-4265.yml b/html/changelogs/AutoChangeLog-pr-4265.yml
@@ -0,0 +1,4 @@
+author: "CapCamIII"
+delete-after: True
+changes:
+  - bugfix: "actually fixes m4ra custom barrel offset"
diff --git a/html/changelogs/AutoChangeLog-pr-4266.yml b/html/changelogs/AutoChangeLog-pr-4266.yml
@@ -0,0 +1,4 @@
+author: "Xufysz"
+delete-after: True
+changes:
+  - bugfix: "Fixes the kitchen soda fountain being wrenchable."
diff --git a/html/changelogs/AutoChangeLog-pr-4267.yml b/html/changelogs/AutoChangeLog-pr-4267.yml
@@ -0,0 +1,5 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - code_imp: "Moved the Request ERT message to a proc to reduce duplication."
+  - admin: "Added a detail in ERT request to indicate if a RANDOM ERT was granted by staff already or not. This will not work for manual specific chosen ERTs."