cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7567 from SamHPurp/re-factors-posters

Browse Source 
Refactors posters
This commit is contained in:
Fox McCloud
2017-07-10 18:48:21 -04:00
committed by GitHub
parent c52a8e76c2 ded0acb5f9
commit 23ee7f02d5
38 changed files with 655 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/cargoprofile.dm
+2 -2
View File
@@ -246,9 +246,9 @@
//Note that this filters out blueprints because they are a paper item. Do NOT throw out the station blueprints unless you be trollin'.
blacklist = null
whitelist = list(/obj/item/trash,/obj/item/toy,/obj/item/weapon/reagent_containers/food/snacks/ectoplasm,/obj/item/weapon/grown/bananapeel,/obj/item/weapon/broken_bottle,/obj/item/weapon/bikehorn,
/obj/item/weapon/cigbutt,/obj/item/weapon/contraband,/obj/item/weapon/grown/corncob,/obj/item/weapon/paper,/obj/item/weapon/shard,
/obj/item/weapon/cigbutt,/obj/item/weapon/poster/random_contraband,/obj/item/weapon/grown/corncob,/obj/item/weapon/paper,/obj/item/weapon/shard,
/obj/item/weapon/sord,/obj/item/weapon/photo,/obj/item/weapon/folder,
/obj/item/areaeditor/blueprints,/obj/item/weapon/contraband,/obj/item/weapon/kitchen,/obj/item/weapon/book,/obj/item/clothing/mask/facehugger)
/obj/item/areaeditor/blueprints,/obj/item/weapon/poster/random_contraband,/obj/item/weapon/kitchen,/obj/item/weapon/book,/obj/item/clothing/mask/facehugger)
/datum/cargoprofile/weapons
name = "Weapons & Illegals"
code/datums/supplypacks.dm
+7 -7
View File
@@ -1339,7 +1339,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/obj/item/weapon/reagent_containers/glass/paint/black,
/obj/item/weapon/reagent_containers/glass/paint/white,
/obj/item/weapon/reagent_containers/glass/paint/remover,
/obj/item/weapon/contraband/poster/legit,
/obj/item/weapon/poster/random_official,
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper)
@@ -1348,11 +1348,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/random_official,
/obj/item/weapon/poster/random_official,
/obj/item/weapon/poster/random_official,
/obj/item/weapon/poster/random_official,
/obj/item/weapon/poster/random_official)
cost = 8
containername = "corporate posters crate"
@@ -1514,7 +1514,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/storage/pill_bottle/random_drug_bottle,
/obj/item/weapon/contraband/poster,
/obj/item/weapon/poster/random_contraband,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims)
name = "Contraband Crate"