Skip to content

Commit

Permalink
Adds more graffiti (faction themed) (#8238)
Browse files Browse the repository at this point in the history
* Adds more graffiti (faction themed)

* Update code/game/objects/items/spraypaint.dm

---------

Co-authored-by: hyperioo <[email protected]>
  • Loading branch information
Twomoon-Github and hyperioo authored Jul 21, 2023
1 parent 93d7203 commit 064061e
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 1 deletion.
31 changes: 31 additions & 0 deletions code/game/objects/effects/decals/Cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,34 @@
desc = "A graffiti of a heart."
icon_state = "heart"

/obj/effect/decal/cleanable/graffiti/graffiti_excelsior
desc = "Ever Upwards!"
icon_state = "excelsior"

/obj/effect/decal/cleanable/graffiti/graffiti_ironhammer
desc = "The best of the best."
icon_state = "ironhammer"

/obj/effect/decal/cleanable/graffiti/graffiti_moebius
desc = "Science never stops."
icon_state = "moebius"

/obj/effect/decal/cleanable/graffiti/graffiti_neotheo
desc = "Mutants not welcomed."
icon_state = "neotheo"

/obj/effect/decal/cleanable/graffiti/graffiti_techno
desc = "Kickstart the Engine."
icon_state = "techno"

/obj/effect/decal/cleanable/graffiti/graffiti_aster
desc = "Blood is the oldest currency."
icon_state = "aster"

/obj/effect/decal/cleanable/graffiti/graffiti_ancapyes
desc = "The great Capital approves."
icon_state = "ancapyes"

/obj/effect/decal/cleanable/graffiti/graffiti_ancapno
desc = "The free market isn't happy."
icon_state = "ancapno"
18 changes: 17 additions & 1 deletion code/game/objects/items/spraypaint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/obj/item/spraypaint/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity) return
if(istype(target,/turf))
var/graffititype = input("Choose what you'd like to paint") in list("Kot","Onestar","Doodle","Piss","Clown","Skull","Heart")
var/graffititype = input("Choose what you'd like to paint") in list("Kot","Onestar","Doodle","Piss","Clown","Skull","Heart","Excelsior","Ironhammer","Moebius","Neotheology","Technomancer","Aster","Ancap yes","Ancap no")
if(uses <= 0)
playsound(loc, 'sound/effects/interaction/graffiti_empty.ogg', 100, 1)
to_chat(user, SPAN_NOTICE("The spray can is empty."))
Expand All @@ -39,6 +39,22 @@
new /obj/effect/decal/cleanable/graffiti/graffiti_skull(target)
if("Heart")
new /obj/effect/decal/cleanable/graffiti/graffiti_heart(target)
if("Excelsior")
new /obj/effect/decal/cleanable/graffiti/graffiti_excelsior(target)
if("Ironhammer")
new /obj/effect/decal/cleanable/graffiti/graffiti_ironhammer(target)
if("Moebius")
new /obj/effect/decal/cleanable/graffiti/graffiti_moebius(target)
if("Neotheology")
new /obj/effect/decal/cleanable/graffiti/graffiti_neotheo(target)
if("Technomancer")
new /obj/effect/decal/cleanable/graffiti/graffiti_techno(target)
if("Aster")
new /obj/effect/decal/cleanable/graffiti/graffiti_aster(target)
if("Ancap yes")
new /obj/effect/decal/cleanable/graffiti/graffiti_ancapyes(target)
if("Ancap no")
new /obj/effect/decal/cleanable/graffiti/graffiti_ancapno(target)
if(uses)
uses--
if(uses <= 0)
Expand Down
Binary file modified icons/effects/wall_graffiti.dmi
Binary file not shown.

0 comments on commit 064061e

Please sign in to comment.