cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds very common (3+) crayon prefabs for maps (#82072)

Browse Source 
## 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.
This commit is contained in:
Bilbo367
2024-03-20 13:40:52 +01:00
committed by GitHub
parent fbf75e8f26
commit 8dfc3a8a30
6 changed files with 70 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/the_outlet.dmm
+2 -6
View File
@@ -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)
@@ -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)
_maps/RandomZLevels/museum.dmm
+9 -21
View File
@@ -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,
@@ -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{
@@ -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,
_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_1.dmm
+15 -60
View File
@@ -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,
@@ -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,
@@ -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,
_maps/map_files/tramstation/tramstation.dmm
+10 -40
View File
@@ -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
},
@@ -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
},
_maps/shuttles/whiteship_obelisk.dmm
+8 -31
View File
@@ -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
@@ -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";
@@ -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
@@ -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)
@@ -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
},
@@ -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" = (
@@ -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
},
@@ -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
},
code/game/objects/effects/decals/crayon.dm
+26
View File
@@ -41,3 +41,29 @@
cost *= 0.5
spraycan.use_charges(user, cost, requires_full = FALSE)
return DONT_USE_SPRAYCAN_CHARGES
///Common crayon decals in map.
/obj/effect/decal/cleanable/crayon/rune4
icon_state = "rune4"
paint_colour = COLOR_CRAYON_RED
/obj/effect/decal/cleanable/crayon/rune2
icon_state = "rune2"
/obj/effect/decal/cleanable/crayon/x
icon_state = "x"
name = "graffiti"
paint_colour = COLOR_CRAYON_ORANGE
/obj/effect/decal/cleanable/crayon/l
icon_state = "l"
/obj/effect/decal/cleanable/crayon/i
icon_state = "i"
/obj/effect/decal/cleanable/crayon/e
icon_state = "e"
/obj/effect/decal/cleanable/crayon/i/orange
name = "graffiti"
paint_colour = COLOR_CRAYON_ORANGE