cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into morphevent

Browse Source
This commit is contained in:
Heroman3003
2020-01-16 09:00:43 +10:00
committed by GitHub
parent 5077419f4e a5b768eccc
commit 4af118cb0d
41 changed files with 437 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/outfits/outfit.dm
View File

@@ -87,7 +87,7 @@ var/list/outfits_decls_by_type_
/decl/hierarchy/outfit/proc/equip(mob/living/carbon/human/H, var/rank, var/assignment)
equip_base(H)
rank = id_pda_assignment || rank
rank = rank || id_pda_assignment
assignment = id_pda_assignment || assignment || rank
var/obj/item/weapon/card/id/W = equip_id(H, rank, assignment)
if(W)

13
code/datums/supplypacks/contraband_vr.dm
View File

@@ -19,3 +19,16 @@
containertype = /obj/structure/largecrate/animal/catgirl
containername = "Catgirl crate"
contraband = 1
/datum/supply_pack/randomised/hospitality/pizzavouchers //WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER
num_contained = 3
contains = list(
/obj/item/pizzavoucher,
/obj/item/pizzavoucher,
/obj/item/pizzavoucher
)
name = "FANTASTIC PIZZA PIE VOUCHER CRATE!"
cost = 60
containertype = /obj/structure/closet/crate
containername = "WE ALWAYS DELIVER!"
contraband = 1