From b71dc4807fe1b65c05ab9e78a25aaadbb41f29c3 Mon Sep 17 00:00:00 2001
From: Erik <eriklecluse@gmail.com>
Date: Wed, 9 Sep 2020 06:52:04 -0700
Subject: [PATCH] Adding CHOMPEdits

---
 code/game/antagonist/outsider/raider.dm                    | 2 +-
 code/game/area/Space Station 13 areas.dm                   | 4 ++--
 code/game/gamemodes/objective.dm                           | 6 +++---
 code/game/machinery/embedded_controller/mapping_helpers.dm | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm
index e48e9e5507..d6c7857ace 100644
--- a/code/game/antagonist/outsider/raider.dm
+++ b/code/game/antagonist/outsider/raider.dm
@@ -196,7 +196,7 @@ var/datum/antagonist/raider/raiders
 		return 0
 
 	for(var/datum/mind/player in current_antagonists)
-		if(!player.current || get_area(player.current) != locate(/area/shuttle/skipjack))
+		if(!player.current || get_area(player.current) != locate(/area/shuttle/skipjack)) // CHOMPEdit: Changed locate to work with new condensed shuttles
 			return 0
 	return 1
 
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index ea66e62715..1b7b7ed38e 100755
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -386,7 +386,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	ambience = AMBIENCE_OTHERWORLDLY
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
 
-/area/skipjack_station
+/area/skipjack_station // CHOMPEdit: Condensing shuttles
 	name = "Raider Outpost"
 	icon_state = "yellow"
 	requires_power = 0
@@ -394,7 +394,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	flags = RAD_SHIELDED
 	ambience = AMBIENCE_HIGHSEC
 
-/area/shuttle/skipjack
+/area/shuttle/skipjack // CHOMPEdit: Condensing shuttles
 	name = "\improper Skipjack"
 	icon_state = "yellow"
 	requires_power = 0
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index f419f4c2aa..d47f6691a0 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -670,7 +670,7 @@ datum/objective/heist/kidnap
 			//if (!target.current.restrained())
 			//	return 0 // They're loose. Close but no cigar.
 
-			var/area/shuttle/skipjack/A = locate()
+			var/area/shuttle/skipjack/A = locate() // CHOMPEdit: Shuttle consensing
 			for(var/mob/living/carbon/human/M in A)
 				if(target.current == M)
 					return 1 //They're restrained on the shuttle. Success.
@@ -721,7 +721,7 @@ datum/objective/heist/loot
 
 		var/total_amount = 0
 
-		for(var/obj/O in locate(/area/shuttle/skipjack))
+		for(var/obj/O in locate(/area/shuttle/skipjack)) // CHOMPEdit: Shuttle consensing
 			if(istype(O,target)) total_amount++
 			for(var/obj/I in O.contents)
 				if(istype(I,target)) total_amount++
@@ -770,7 +770,7 @@ datum/objective/heist/salvage
 
 		var/total_amount = 0
 
-		for(var/obj/item/O in locate(/area/shuttle/skipjack))
+		for(var/obj/item/O in locate(/area/shuttle/skipjack)) // CHOMPEdit: Shuttle consensing
 
 			var/obj/item/stack/material/S
 			if(istype(O,/obj/item/stack/material))
diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm
index f68eb770d3..6c64e9406a 100644
--- a/code/game/machinery/embedded_controller/mapping_helpers.dm
+++ b/code/game/machinery/embedded_controller/mapping_helpers.dm
@@ -138,6 +138,8 @@ Any frequency works, it's self-setting, but it seems like people have decided 13
 
 /*
 	Sensors - did you know they function as buttons? You don't also need a button.
+	CHOMPEdit:	They don't function identically to buttons. They're also entirely unnecessary for station use because of their complexity.
+				They do function well and should be used for shuttle airlocks but unchanging environments don't need sensors.
 */
 /obj/effect/map_helper/airlock/sensor
 	name = "use a subtype! - airlock sensor"
@@ -177,6 +179,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13
 	Buttons
 */
 
+// CHOMPStation Addition: Button helpers, because they didn't exist before due to 'just use sensors'
 /obj/effect/map_helper/airlock/button
 	name = "Use a subtype! - button"
 	my_device_type = /obj/machinery/access_button