Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds graffiti + spraypaint #8232

Merged
merged 21 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
98ae4a6
Adds graffiti + spraypaint
Twomoon-Github Jul 11, 2023
5e53640
Update misc.dm
Twomoon-Github Jul 11, 2023
68538de
remove upper case for icon states
Twomoon-Github Jul 11, 2023
42c443f
Merge branch 'graffiti' of https://github.com/Skegal/CEV-Eris into gr…
Twomoon-Github Jul 11, 2023
3c8cb44
Add limited use to the spray + empty spray sound
Twomoon-Github Jul 11, 2023
774bad0
fixed the graffiti cancelling upon moving
Twomoon-Github Jul 11, 2023
14072ea
create parent for graffiti
Twomoon-Github Jul 11, 2023
f97f25b
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 11, 2023
bd97de4
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 11, 2023
23fe1ff
Update code/datums/autolathe/devices.dm
Twomoon-Github Jul 11, 2023
e92b963
Update code/game/objects/items/weapons/design_disks/asters.dm
Twomoon-Github Jul 11, 2023
7958131
remove the can delete + empty can sprites added
Twomoon-Github Jul 11, 2023
0f7e627
fix graffiti parent and space between and 1graffit
Twomoon-Github Jul 11, 2023
fc72e41
fix cheapcan (extinguisher is 3 steel for ref)
Twomoon-Github Jul 11, 2023
8e55693
fix empty spray can
Twomoon-Github Jul 11, 2023
aff397e
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 12, 2023
362d6cc
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 12, 2023
4cafb78
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 12, 2023
69e8d3b
Update code/game/objects/items/spraypaint.dm
Twomoon-Github Jul 12, 2023
146e8f4
fix sound timing
Twomoon-Github Jul 12, 2023
2b47756
changed the span notice
Twomoon-Github Jul 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cev_eris.dme
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@
#include "code\game\objects\items\paintkit.dm"
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\slimeflashlight.dm"
#include "code\game\objects\items\spraypaint.dm"
#include "code\game\objects\items\talking_crystal.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm"
Expand Down
4 changes: 4 additions & 0 deletions code/datums/autolathe/devices.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,7 @@
/datum/design/autolathe/device/mechpainter
name = "mech painter"
build_path = /obj/item/device/floor_painter/mech_painter

/datum/design/autolathe/device/spraypaint
name = "spraycan"
build_path = /obj/item/spraypaint
41 changes: 41 additions & 0 deletions code/game/objects/effects/decals/Cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,44 @@
icon_state = "asteroid0"
random_rotation = 2
random_icon_states = list("asteroid0", "asteroid1", "asteroid2", "asteroid3", "asteroid4", "asteroid5", "asteroid6","asteroid7","asteroid8")

/obj/effect/decal/cleanable/graffiti
name = "graffiti"
desc = "A graffiti."
density = FALSE
anchored = TRUE
plane = -1
icon = 'icons/effects/wall_graffiti.dmi'
icon_state = "kot"
random_rotation = 0

/obj/effect/decal/cleanable/graffiti/graffiti_kot
Twomoon-Github marked this conversation as resolved.
Show resolved Hide resolved
desc = "A graffiti of a very happy cat."
icon_state = "kot"

/obj/effect/decal/cleanable/graffiti/graffiti_onestar
desc = "A graffiti of one star's eye."
icon_state = "onestar"


/obj/effect/decal/cleanable/graffiti/graffiti_doodle
desc = "A vagabond beaten by IH, this is mercenary brutality."
icon_state = "doodle"

/obj/effect/decal/cleanable/graffiti/graffiti_piss
desc = "A graffiti of, well."
icon_state = "piss"

/obj/effect/decal/cleanable/graffiti/graffiti_clown
desc = "A graffiti of a clown."
icon_state = "clown"

/obj/effect/decal/cleanable/graffiti/graffiti_skull
desc = "A graffiti of a skull."
icon_state = "skull"


/obj/effect/decal/cleanable/graffiti/graffiti_heart
desc = "A graffiti of a heart."
icon_state = "heart"

49 changes: 49 additions & 0 deletions code/game/objects/items/spraypaint.dm
Twomoon-Github marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/obj/item/spraypaint
name = "spraycan"
desc = "Aerosol paint sealed in a pressurized container."
icon = 'icons/obj/items.dmi'
icon_state = "spraypaint"
matter = list(MATERIAL_PLASTIC = 4, MATERIAL_STEEL = 5)
price_tag = 40
var/uses = 30
w_class = ITEM_SIZE_SMALL
throwforce = WEAPON_FORCE_HARMLESS

/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")
if(uses <= 0)
playsound(loc, 'sound/effects/interaction/graffiti_empty.ogg', 100, 1)
to_chat(user, SPAN_NOTICE("The spray can is empty."))
return FALSE
else
playsound(loc, 'sound/effects/interaction/graffiti.ogg', 100, 1)
if(do_after(user, 2 SECONDS, target))
to_chat(user, SPAN_NOTICE("You start tagging \the [target.name]!"))
else
to_chat(user, SPAN_NOTICE("You must stand still while tagging \the [target.name]!."))
return FALSE
switch(graffititype)
if("Kot")
new /obj/effect/decal/cleanable/graffiti/graffiti_kot(target)
if("Onestar")
new /obj/effect/decal/cleanable/graffiti/graffiti_onestar(target)
if("Doodle")
new /obj/effect/decal/cleanable/graffiti/graffiti_doodle(target)
if("Piss")
new /obj/effect/decal/cleanable/graffiti/graffiti_piss(target)
if("Clown")
new /obj/effect/decal/cleanable/graffiti/graffiti_clown(target)
if("Skull")
new /obj/effect/decal/cleanable/graffiti/graffiti_skull(target)
if("Heart")
new /obj/effect/decal/cleanable/graffiti/graffiti_heart(target)
if(uses)
uses--
if(uses <= 0)
playsound(loc, 'sound/effects/interaction/graffiti_empty.ogg', 100, 1)
to_chat(user, SPAN_NOTICE("You have emptied the spray can."))
icon_state = "spraypaint_empty"
name = "empty spraycan"
desc = "This spraycan is empty."
3 changes: 2 additions & 1 deletion code/game/objects/items/weapons/design_disks/asters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
/datum/design/autolathe/device/floorpainter,
/datum/design/autolathe/device/mechpainter,
/datum/design/autolathe/container/hcase_engi,
/datum/design/autolathe/container/hcase_parts
/datum/design/autolathe/container/hcase_parts,
/datum/design/autolathe/device/spraypaint
)

/obj/item/computer_hardware/hard_drive/portable/design/devices
Expand Down
Binary file added icons/effects/wall_graffiti.dmi
Binary file not shown.
Binary file modified icons/obj/items.dmi
Binary file not shown.
Binary file added sound/effects/interaction/graffiti.ogg
Binary file not shown.
Binary file added sound/effects/interaction/graffiti_empty.ogg
Binary file not shown.
Loading