cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding CHOMPEdits

Browse Source
This commit is contained in:
Erik
2020-09-09 06:52:04 -07:00
parent 0dbea259cf
commit b71dc4807f
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/antagonist/outsider/raider.dm
View File

@@ -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

4
code/game/area/Space Station 13 areas.dm
View File

@@ -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

6
code/game/gamemodes/objective.dm
View File

@@ -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))

3
code/game/machinery/embedded_controller/mapping_helpers.dm
View File

@@ -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