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

Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590

Browse Source 
[MIRROR] Reorganizes cargo's big "miscellaneous supplies" category
This commit is contained in:
deathride58
2018-05-02 01:32:40 +00:00
committed by GitHub
parent 4d44701ee5 e2a4524b5b
commit 9151a80461
2 changed files with 637 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs.dm
+636 -594
View File
File diff suppressed because it is too large Load Diff
code/modules/events/shuttle_loan.dm
+1 -1
View File
@@ -157,7 +157,7 @@
shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
if(RUSKY_PARTY)
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/organic/party]
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/service/party]
pack.generate(pick_n_take(empty_shuttle_turfs))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian)