cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition

Browse Source 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
This commit is contained in:
Steelpoint
2015-09-09 11:47:44 +08:00
parent 0e9a6106a3 44033427a9
commit d45890b4df
46 changed files with 63611 additions and 7405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+6 -6
View File
@@ -1107,11 +1107,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/datum/supply_packs/misc/posters
name = "Corporate Posters Crate"
contains = list(/obj/item/weapon/contraband/poster/legit,
/obj/item/weapon/contraband/poster/legit,
/obj/item/weapon/contraband/poster/legit,
/obj/item/weapon/contraband/poster/legit,
/obj/item/weapon/contraband/poster/legit)
contains = list(/obj/item/weapon/poster/legit,
/obj/item/weapon/poster/legit,
/obj/item/weapon/poster/legit,
/obj/item/weapon/poster/legit,
/obj/item/weapon/poster/legit)
cost = 8
containername = "Corporate Posters Crate"
@@ -1265,7 +1265,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/datum/supply_packs/misc/randomised/contraband
num_contained = 5
contains = list(/obj/item/weapon/contraband/poster,
contains = list(/obj/item/weapon/poster/contraband,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims)
name = "Contraband Crate"