cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-13 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict drinks.dmi

Browse Source
This commit is contained in:
Dip
2020-10-29 13:50:19 -03:00
parent 82daa9b75e bbbd52a4a4
commit 9acf8ffd40
97 changed files with 327 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/on_move.dm
+1 -1
View File
@@ -290,7 +290,7 @@ All ShuttleMove procs go here
// ignores the movement of the shuttle from the staging area on CentCom to
// the station as it is loaded in.
if (oldT && !is_centcom_level(oldT.z))
GET_COMPONENT(STR, /datum/component/storage/concrete/emergency)
var/datum/component/storage/concrete/emergency/STR = GetComponent(/datum/component/storage/concrete/emergency)
STR?.unlock_me()
/************************************Mob move procs************************************/