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

Merge pull request #1173 from Citadel-Station-13/upstream-merge-27607

Browse Source 
[MIRROR] Fixed some jobs not spawning with their box
This commit is contained in:
LetterJay
2017-05-30 15:18:54 -05:00
committed by GitHub
parent 9e93c103fd e61acac6cc
commit 2de531b2e7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/jobs/job_types/job.dm
View File

@@ -159,6 +159,8 @@
back = backpack //Department backpack
if(box)
if(!backpack_contents)
backpack_contents = list()
backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
backpack_contents[box] = 1

12
code/modules/jobs/job_types/job.dm.rej Normal file
View File

@@ -0,0 +1,12 @@
diff a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm (rejected hunks)
@@ -156,7 +156,9 @@
else
back = backpack //Department backpack
- if(backpack_contents && box)
+ if(box)
+ if(!backpack_contents)
+ backpack_contents = list()
backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
backpack_contents[box] = 1