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
_maps/basemap.dm
+1 -2
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
_maps/map_files/Deltastation/DeltaStation2.dmm
+3 -3
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" = (
_maps/map_files/MetaStation/MetaStation.dmm
+3 -3
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" = (
_maps/map_files/OmegaStation/OmegaStation.dmm
+1 -1
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
},
_maps/map_files/PubbyStation/PubbyStation.dmm
+2 -10
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" = (
_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
+23
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" = (