shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Centcomm is on Z1

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-27 20:57:26 -05:00
parent 499ef04593
commit 29c15fe9fd
15 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/antag_spawner.dm
+1 -1
View File
@@ -236,7 +236,7 @@
/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user)
if(user.z != 1)
if(user.z != ZLEVEL_STATION)
to_chat(user, "<span class='notice'>You should probably wait until you reach the station.</span>")
return
if(used)
code/game/gamemodes/game_mode.dm
+2 -2
View File
@@ -233,11 +233,11 @@
if(ishuman(M))
if(!M.stat)
surviving_humans++
if(M.z == 2)
if(M.z == ZLEVEL_CENTCOM)
escaped_humans++
if(!M.stat)
surviving_total++
if(M.z == 2)
if(M.z == ZLEVEL_CENTCOM)
escaped_total++
code/game/gamemodes/gang/gang_items.dm
+1 -1
View File
@@ -412,7 +412,7 @@
/datum/gang_item/equipment/dominator/purchase(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool)
var/area/usrarea = get_area(user.loc)
var/usrturf = get_turf(user.loc)
if(initial(usrarea.name) == "Space" || isspaceturf(usrturf) || usr.z != 1)
if(initial(usrarea.name) == "Space" || isspaceturf(usrturf) || usr.z != ZLEVEL_STATION)
to_chat(user, "<span class='warning'>You can only use this on the station!</span>")
return FALSE
code/game/gamemodes/gang/gang_items.dm.rej
+17
View File
@@ -0,0 +1,17 @@
diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm (rejected hunks)
@@ -325,13 +325,13 @@
user.put_in_hands(O)
if(spawn_msg)
to_chat(user, spawn_msg)
-
+
/datum/gang_item/equipment/wetwork_boots
name = "Wetwork boots"
id = "wetwork"
cost = 20
item_path = /obj/item/clothing/shoes/combat/gang
-
+
/obj/item/clothing/shoes/combat/gang
name = "Wetwork boots"
desc = "A gang's best hitmen are prepared for anything."
code/game/gamemodes/gang/recaller.dm
+2 -2
View File
@@ -194,7 +194,7 @@
return 0
var/turf/userturf = get_turf(user)
if(userturf.z != 1) //Shuttle can only be recalled while on station
if(userturf.z != ZLEVEL_STATION) //Shuttle can only be recalled while on station
to_chat(user, "<span class='warning'>\icon[src]Error: Device out of range of station communication arrays.</span>")
recalling = 0
return 0
@@ -212,7 +212,7 @@
log_game("[key_name(user)] has tried to recall the shuttle with a gangtool.")
message_admins("[key_name_admin(user)] has tried to recall the shuttle with a gangtool.", 1)
userturf = get_turf(user)
if(userturf.z == 1) //Check one more time that they are on station.
if(userturf.z == ZLEVEL_STATION) //Check one more time that they are on station.
if(SSshuttle.cancelEvac(user))
gang.recalls -= 1
return 1