Skip to content

Commit

Permalink
Adds very common (3+) crayon prefabs for maps (tgstation#82072)
Browse files Browse the repository at this point in the history 
## About The Pull Request

Adds a bunch of crayon prefabs for the maps.

## Why It's Good For The Game

Reduces 45 map Var edits, and completely removes some Var edits.
  • Loading branch information
@Bilbo367
Bilbo367 authored Mar 20, 2024
1 parent fbf75e8 commit 8dfc3a8
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 158 deletions.
8 changes: 2 additions & 6 deletions _maps/RandomRuins/SpaceRuins/the_outlet.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,9 +1478,7 @@
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-110"
},
/obj/effect/decal/cleanable/crayon{
icon_state = "rune2"
},
/obj/effect/decal/cleanable/crayon/rune2,
/mob/living/basic/construct/proteon/hostile,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/the_outlet/researchrooms)
Expand Down Expand Up @@ -1574,9 +1572,7 @@
/area/template_noop)
"LL" = (
/mob/living/basic/construct/proteon/hostile,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune2"
},
/obj/effect/decal/cleanable/crayon/rune2,
/obj/effect/gibspawner/human,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/the_outlet/researchrooms)
Expand Down
30 changes: 9 additions & 21 deletions _maps/RandomZLevels/museum.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,11 @@
/turf/open/indestructible/plating,
/area/awaymission/museum)
"ek" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "l";
/obj/effect/decal/cleanable/crayon/l{
pixel_x = -10
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i"
},
/obj/effect/decal/cleanable/crayon{
icon_state = "e";
/obj/effect/decal/cleanable/crayon/i,
/obj/effect/decal/cleanable/crayon/e{
pixel_x = 12
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -1001,15 +997,11 @@
/turf/open/floor/iron/dark,
/area/awaymission/museum)
"ix" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "l";
/obj/effect/decal/cleanable/crayon/l{
pixel_x = -10
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i"
},
/obj/effect/decal/cleanable/crayon{
icon_state = "e";
/obj/effect/decal/cleanable/crayon/i,
/obj/effect/decal/cleanable/crayon/e{
pixel_x = 12
},
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -4007,15 +3999,11 @@
/turf/open/floor/iron/white/small,
/area/awaymission/museum)
"Gv" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "l";
/obj/effect/decal/cleanable/crayon/l{
pixel_x = -10
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i"
},
/obj/effect/decal/cleanable/crayon{
icon_state = "e";
/obj/effect/decal/cleanable/crayon/i,
/obj/effect/decal/cleanable/crayon/e{
pixel_x = 12
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
75 changes: 15 additions & 60 deletions _maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,23 @@
/area/station/maintenance/starboard/lesser)
"g" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 37;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 22;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 27;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 32;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "x";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/x{
pixel_x = 32
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -77,38 +62,23 @@
/area/station/maintenance/starboard/lesser)
"t" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 37;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 22;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 27;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 32;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "x";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/x{
pixel_x = 32
},
/obj/effect/spawner/random/trash/food_packaging,
Expand All @@ -131,38 +101,23 @@
/area/station/maintenance/starboard/lesser)
"x" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 37;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 22;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 27;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 32;
pixel_y = 1
},
/obj/effect/decal/cleanable/crayon{
icon_state = "x";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/x{
pixel_x = 32
},
/obj/effect/spawner/random/trash/food_packaging,
Expand Down
50 changes: 10 additions & 40 deletions _maps/map_files/tramstation/tramstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8739,37 +8739,22 @@
/area/station/commons/lounge)
"bXp" = (
/obj/item/toy/crayon/orange,
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 8;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 4;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = -4;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "x";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/x{
pixel_x = 4;
pixel_y = -32
},
Expand Down Expand Up @@ -63226,37 +63211,22 @@
/area/station/maintenance/tram/mid)
"viW" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 8;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = 4;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "i";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/i/orange{
pixel_x = -4;
pixel_y = -32
},
/obj/effect/decal/cleanable/crayon{
icon_state = "x";
name = "graffiti";
paint_colour = "#FF9300";
/obj/effect/decal/cleanable/crayon/x{
pixel_x = 4;
pixel_y = -32
},
Expand Down
39 changes: 8 additions & 31 deletions _maps/shuttles/whiteship_obelisk.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@
"gw" = (
/obj/structure/cable,
/mob/living/basic/construct/proteon/hostile,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/effect/decal/cleanable/glass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
Expand Down Expand Up @@ -213,9 +210,7 @@
/area/shuttle/abandoned/engine)
"mQ" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune2"
},
/obj/effect/decal/cleanable/crayon/rune2,
/obj/effect/mob_spawn/corpse/human/damaged,
/obj/machinery/button/door/directional/west{
name = "Bolt Control";
Expand Down Expand Up @@ -252,10 +247,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned/bridge)
"ne" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
Expand Down Expand Up @@ -308,10 +300,7 @@
/area/shuttle/abandoned/bar)
"oY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/effect/turf_decal/tile/dark_blue/half,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned/bridge)
Expand Down Expand Up @@ -439,10 +428,7 @@
"yo" = (
/obj/structure/cable,
/mob/living/basic/construct/proteon/hostile,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -496,10 +482,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/crew)
"Cv" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/abandoned)
"CX" = (
Expand Down Expand Up @@ -599,10 +582,7 @@
"HU" = (
/obj/structure/cable,
/mob/living/basic/construct/juggernaut/hostile,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -780,10 +760,7 @@
"SE" = (
/obj/structure/cable,
/mob/living/basic/construct/proteon/hostile,
/obj/effect/decal/cleanable/crayon{
icon_state = "rune4";
paint_colour = "#DC143C"
},
/obj/effect/decal/cleanable/crayon/rune4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
Expand Down
Loading

0 comments on commit 8dfc3a8

Please sign in to comment.