From 30ceab8c1961fde42b2252dcb845849a2abbc5c5 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Sun, 10 Jan 2016 02:33:07 -0500 Subject: [PATCH 1/4] Spraypainted stuff no longer appears to be drawn with crayons. --- code/game/objects/effects/decals/crayon.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index bbe88b07c86..273cef404f2 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -30,6 +30,7 @@ color = main /obj/effect/decal/cleanable/crayon/gang + desc = "A spray-painted [name]." layer = 3.6 //Harder to hide do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. var/datum/gang/gang @@ -55,4 +56,4 @@ gang.territory -= territory.type gang.territory_new -= territory.type gang.territory_lost |= list(territory.type = territory.name) - return ..() \ No newline at end of file + return ..() From ebb7e62edccc9109c5ed69baf8c739ca46f26247 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Sun, 10 Jan 2016 02:54:22 -0500 Subject: [PATCH 2/4] Update crayon.dm --- code/game/objects/effects/decals/crayon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 273cef404f2..b8838a6f46b 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -30,7 +30,7 @@ color = main /obj/effect/decal/cleanable/crayon/gang - desc = "A spray-painted [name]." + desc = "Spray-painted graffiti." layer = 3.6 //Harder to hide do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. var/datum/gang/gang From 18bab22f2563f123eaca29a3d787830e6592c472 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Sun, 10 Jan 2016 18:23:43 -0500 Subject: [PATCH 3/4] New spraypaint decal --- code/game/objects/effects/decals/crayon.dm | 36 +++++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index b8838a6f46b..b7793974ee4 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -29,19 +29,45 @@ color = main -/obj/effect/decal/cleanable/crayon/gang - desc = "Spray-painted graffiti." +/obj/effect/decal/cleanable/crayon/spaint + name = "spraypaint" + desc = "A spraypainted rune." + icon = 'icons/effects/crayondecal.dmi' + icon_state = "rune1" + layer = 2.1 + var/do_icon_rotate = TRUE + + +/obj/effect/decal/cleanable/crayon/spaint/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0) + ..() + loc = location + + name = e_name + desc = "A spraypainted [name]." + if(type == "poseur tag") + type = pick(gang_name_pool) + icon_state = type + + if(rotation && do_icon_rotate) + var/matrix/M = matrix() + M.Turn(rotation) + src.transform = M + + color = main + +/obj/effect/decal/cleanable/crayon/spaint/gang layer = 3.6 //Harder to hide do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. var/datum/gang/gang -/obj/effect/decal/cleanable/crayon/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) +/obj/effect/decal/cleanable/crayon/spaint/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) if(!type || !G) qdel(src) var/area/territory = get_area(location) var/color - + name = e_name + desc = "A spraypainted [name]." gang = G color = G.color_hex icon_state = G.name @@ -49,7 +75,7 @@ ..(location, color, icon_state, e_name, rotation) -/obj/effect/decal/cleanable/crayon/gang/Destroy() +/obj/effect/decal/cleanable/crayon/spaint/gang/Destroy() var/area/territory = get_area(src) if(gang) From 692d3a6100368361a4d605f40a5c46d2f272a219 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Sun, 10 Jan 2016 18:46:38 -0500 Subject: [PATCH 4/4] Fuck it just genericize the description. --- code/game/objects/effects/decals/crayon.dm | 38 ++++------------------ 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index b7793974ee4..2f5bd9ea000 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -1,6 +1,6 @@ /obj/effect/decal/cleanable/crayon name = "rune" - desc = "A rune drawn in crayon." + desc = "Graffiti. Damn kids." icon = 'icons/effects/crayondecal.dmi' icon_state = "rune1" layer = 2.1 @@ -17,7 +17,7 @@ loc = location name = e_name - desc = "A [name] drawn in crayon." + desc = "A [name] vandalizing the station." if(type == "poseur tag") type = pick(gang_name_pool) icon_state = type @@ -29,45 +29,19 @@ color = main -/obj/effect/decal/cleanable/crayon/spaint - name = "spraypaint" - desc = "A spraypainted rune." - icon = 'icons/effects/crayondecal.dmi' - icon_state = "rune1" - layer = 2.1 - var/do_icon_rotate = TRUE - -/obj/effect/decal/cleanable/crayon/spaint/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0) - ..() - loc = location - - name = e_name - desc = "A spraypainted [name]." - if(type == "poseur tag") - type = pick(gang_name_pool) - icon_state = type - - if(rotation && do_icon_rotate) - var/matrix/M = matrix() - M.Turn(rotation) - src.transform = M - - color = main - -/obj/effect/decal/cleanable/crayon/spaint/gang +/obj/effect/decal/cleanable/crayon/gang layer = 3.6 //Harder to hide do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. var/datum/gang/gang -/obj/effect/decal/cleanable/crayon/spaint/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) +/obj/effect/decal/cleanable/crayon/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) if(!type || !G) qdel(src) var/area/territory = get_area(location) var/color - name = e_name - desc = "A spraypainted [name]." + gang = G color = G.color_hex icon_state = G.name @@ -75,7 +49,7 @@ ..(location, color, icon_state, e_name, rotation) -/obj/effect/decal/cleanable/crayon/spaint/gang/Destroy() +/obj/effect/decal/cleanable/crayon/gang/Destroy() var/area/territory = get_area(src) if(gang)