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

Clown Toy Box + Wooden Crates

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-09 11:02:37 -05:00
parent 7fa05ca854
commit f26cf4e9ef
13 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/cargo/exports/large_objects.dm
View File

@@ -14,7 +14,7 @@
/datum/export/large/crate/wooden
cost = 100
unit_name = "wooden crate"
unit_name = "large wooden crate"
export_types = list(/obj/structure/closet/crate/large)
exclude_types = list()
@@ -22,6 +22,13 @@
unit_name = "ore box"
export_types = list(/obj/structure/ore_box)
/datum/export/large/crate/wood
cost = 240
unit_name = "wooden crate"
export_types = list(/obj/structure/closet/crate/wooden)
exclude_types = list()
// Reagent dispensers.
/datum/export/large/reagent_dispenser

10
code/modules/cargo/exports/large_objects.dm.rej Normal file
View File

@@ -0,0 +1,10 @@
diff a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm (rejected hunks)
@@ -6,7 +6,7 @@
k_elasticity = 0
unit_name = "crate"
export_types = list(/obj/structure/closet/crate)
- exclude_types = list(/obj/structure/closet/crate/large)
+ exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)
/datum/export/large/crate/total_printout() // That's why a goddamn metal crate costs that much.
. = ..()

3
code/modules/jobs/job_types/civilian.dm
View File

@@ -34,9 +34,6 @@ Clown
/obj/item/weapon/stamp/clown = 1,
/obj/item/weapon/reagent_containers/spray/waterflower = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/device/megaphone/clown = 1,
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,
/obj/item/weapon/pneumatic_cannon/pie = 1
)
implants = list(/obj/item/weapon/implant/sad_trombone)