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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

Browse Source 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
This commit is contained in:
LetterJay
2017-12-29 01:34:17 -06:00
parent 1047dccdd5 96543b5e63
commit 518b264654
64 changed files with 1434 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/blackbox.dm
+1
View File
@@ -16,6 +16,7 @@ SUBSYSTEM_DEF(blackbox)
/datum/controller/subsystem/blackbox/Initialize()
triggertime = world.time
record_feedback("amount", "random_seed", Master.random_seed)
. = ..()
//poll population
code/controllers/subsystem/parallax.dm
+2 -2
View File
@@ -21,8 +21,8 @@ SUBSYSTEM_DEF(parallax)
return
continue
var/atom/movable/A = C.eye
if(!A)
return
if(!istype(A))
continue
for (A; isloc(A.loc) && !isturf(A.loc); A = A.loc);
if(A != C.movingmob)
code/controllers/subsystem/shuttle.dm
+2 -2
View File
@@ -400,7 +400,7 @@ SUBSYSTEM_DEF(shuttle)
if(M.request(getDock(destination)))
return 2
else
if(M.dock(getDock(destination)) != DOCKING_SUCCESS)
if(M.initiate_docking(getDock(destination)) != DOCKING_SUCCESS)
return 2
return 0 //dock successful
@@ -415,7 +415,7 @@ SUBSYSTEM_DEF(shuttle)
if(M.request(D))
return 2
else
if(M.dock(D) != DOCKING_SUCCESS)
if(M.initiate_docking(D) != DOCKING_SUCCESS)
return 2
return 0 //dock successful