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

Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621

Browse Source 
[MIRROR] removes silly garbage defines
This commit is contained in:
LetterJay
2018-01-02 04:52:57 -06:00
committed by GitHub
parent c5a70ff34c 3ee2569379
commit b49009d481
38 changed files with 173 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/miniantags/borer/borer_event.dm
+1 -1
View File
@@ -27,7 +27,7 @@
if(QDELETED(temp_vent))
continue
if(temp_vent.loc.z == ZLEVEL_STATION_PRIMARY && !temp_vent.welded)
var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
if(temp_vent_parent.other_atmosmch.len > 20)
vents += temp_vent
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -133,7 +133,7 @@
else if(entry_vent)
if(get_dist(src, entry_vent) <= 1)
var/list/vents = list()
var/datum/pipeline/entry_vent_parent = entry_vent.PARENT1
var/datum/pipeline/entry_vent_parent = entry_vent.parents[1]
for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmosmch)
vents.Add(temp_vent)
if(!vents.len)