cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-27 14:06:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4838 from VOREStation/pol-emerboxes

Browse Source 
Port Bay's survival boxes
This commit is contained in:
Anewbe
2018-02-17 10:05:39 -06:00
committed by GitHub
parent eeacf6f039 f4d0ec3fb8
commit 329a65be08
16 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/_defines.dm
+1
View File
@@ -1,6 +1,7 @@
#define OUTFIT_HAS_JETPACK 1
#define OUTFIT_HAS_BACKPACK 2
#define OUTFIT_EXTENDED_SURVIVAL 4
#define OUTFIT_COMPREHENSIVE_SURVIVAL 8
#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
code/datums/outfits/outfit.dm
+1 -1
View File
@@ -146,7 +146,7 @@ var/list/outfits_decls_by_type_
if(r_hand)
H.put_in_r_hand(new r_hand(H))
if(H.species)
H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL)
H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL)
/decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
if(!id_slot || !id_type)