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

Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227

Browse Source 
[MIRROR] Clown Toy Box + Wooden Crates
This commit is contained in:
LetterJay
2017-06-26 04:29:08 -05:00
committed by GitHub
parent 609ccb554c cb6400deba
commit ed6c0b042e
13 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
_maps/basemap.dm
View File

@@ -11,7 +11,6 @@
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\Cerestation\cerestation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\SpaceStation.dmm"
@@ -24,4 +23,4 @@
#include "templates.dm"
#endif
#endif
#endif

6
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -17339,6 +17339,8 @@
name = "Station Intercom";
pixel_y = 26
},
/obj/item/toy/figure/clown,
/obj/item/weapon/clipboard,
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"aKQ" = (
@@ -103459,12 +103461,10 @@
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"efc" = (
/obj/structure/table/wood,
/obj/item/weapon/clipboard,
/obj/item/toy/figure/clown,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
/obj/structure/closet/crate/wooden/toy,
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"efd" = (

6
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -87202,20 +87202,20 @@
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
/obj/item/clothing/mask/cigarette/pipe,
/obj/item/clothing/mask/fakemoustache,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"dir" = (
/obj/item/clothing/mask/fakemoustache,
/obj/item/clothing/mask/cigarette/pipe,
/obj/machinery/camera{
c_tag = "Theatre - Backstage";
dir = 1;
network = list("SS13")
},
/obj/structure/table/wood,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
/obj/structure/closet/crate/wooden/toy,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"dis" = (

2
_maps/map_files/OmegaStation/OmegaStation.dmm
View File

@@ -19030,7 +19030,6 @@
"aET" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/crayons,
/obj/item/weapon/storage/crayons,
/obj/item/device/flashlight/lamp/bananalamp{
pixel_y = 5
},
@@ -19051,6 +19050,7 @@
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
/obj/structure/closet/crate/wooden/toy,
/turf/open/floor/plasteel/vault{
dir = 5
},

12
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -21754,19 +21754,11 @@
/obj/item/weapon/soap,
/obj/structure/table/wood,
/obj/item/weapon/bikehorn,
/obj/item/toy/cattoy,
/turf/open/floor/plasteel/black,
/area/crew_quarters/theatre)
"aSY" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/crayons{
pixel_x = 3;
pixel_y = 3
},
/obj/item/weapon/reagent_containers/food/snacks/pie/cream{
pixel_x = -3;
pixel_y = -3
},
/obj/item/toy/cattoy,
/obj/structure/closet/crate/wooden/toy,
/turf/open/floor/plasteel/black,
/area/crew_quarters/theatre)
"aSZ" = (

23
_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej Normal file
View File

@@ -0,0 +1,23 @@
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
@@ -15614,20 +15614,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aHZ" = (
-/obj/structure/table/wood,
/obj/machinery/airalarm{
dir = 4;
icon_state = "alarm0";
pixel_x = -22
},
-/obj/item/weapon/storage/crayons{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/weapon/reagent_containers/food/snacks/pie/cream{
- pixel_x = -3;
- pixel_y = -3
- },
+/obj/structure/closet/crate/wooden/toy,
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"aIa" = (

1
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = 1, on_floor = 1),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = 1, on_floor = 1),\
new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\
))

18
code/game/objects/structures/crates_lockers/crates/wooden.dm Normal file
View File

@@ -0,0 +1,18 @@
/obj/structure/closet/crate/wooden
name = "wooden crate"
desc = "Works just as well as a metal one."
material_drop = /obj/item/stack/sheet/mineral/wood
material_drop_amount = 6
icon_state = "wooden"
/obj/structure/closet/crate/wooden/toy
name = "toy box"
desc = "It has the words \"Clown + Mime\" written underneath of it with marker."
/obj/structure/closet/crate/wooden/toy/PopulateContents()
. = ..()
new /obj/item/device/megaphone/clown(src)
new /obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
new /obj/item/weapon/pneumatic_cannon/pie(src)
new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
new /obj/item/weapon/storage/crayons(src)

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

@@ -5,7 +5,7 @@
cost = 500
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.
. = ..()
@@ -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)

BIN
icons/obj/crates.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

1
tgstation.dme
View File

@@ -991,6 +991,7 @@
#include "code\game\objects\structures\crates_lockers\crates\critter.dm"
#include "code\game\objects\structures\crates_lockers\crates\large.dm"
#include "code\game\objects\structures\crates_lockers\crates\secure.dm"
#include "code\game\objects\structures\crates_lockers\crates\wooden.dm"
#include "code\game\objects\structures\transit_tubes\station.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube_construction.dm"