cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Graffitis now take into account where on the tile you click (#8982)

Browse Source
This commit is contained in:
Guti
2024-09-23 18:15:04 +02:00
committed by GitHub
parent b474ef3358
commit 7b41a505f7
9 changed files with 146 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
code/modules/persistence/effects/filth.dm
View File

@@ -2,6 +2,17 @@
name = "filth"
entries_expire_at = 4 // 4 rounds, 24 hours.
var/saves_dirt = TRUE //VOREStation edit
has_admin_data = TRUE // CHOMPEdit
// CHOMPAdd
/datum/persistent/filth/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
if(istype(thing, /obj/effect/decal/cleanable/crayon))
var/obj/effect/decal/cleanable/crayon/CRAY = thing
if(can_modify)
return "<td colspan = 3>[thing]</td><td>Loc:([CRAY.x],[CRAY.y],[CRAY.z]) P_X: [CRAY.pixel_x] P_Y: [CRAY.pixel_y] Color: [CRAY.art_color] Shading: [CRAY.art_shade] Type: [CRAY.art_type]</td><td><a href='byond://?src=\ref[src];caller=\ref[user];remove_entry=\ref[thing]'>Destroy</a></td>"
return "<td colspan = 4>[thing]</td>"
return null
// CHOMPEnd
/datum/persistent/filth/IsValidEntry(var/atom/entry)
. = ..() && entry.invisibility == 0
@@ -9,15 +20,48 @@
/datum/persistent/filth/CheckTokenSanity(var/list/token)
// byond's json implementation is "questionable", and uses types as keys and values without quotes sometimes even though they aren't valid json
token["path"] = istext(token["path"]) ? text2path(token["path"]) : token["path"]
return ..() && ispath(token["path"])
// CHOMPAdd - Cooler graffiti
token["pixel_x"] = istext(token["pixel_x"]) ? text2num(token["pixel_x"]) : token["pixel_x"]
token["pixel_y"] = istext(token["pixel_y"]) ? text2num(token["pixel_y"]) : token["pixel_y"]
return ..() && ispath(token["path"]) && isnum(token["pixel_x"]) && isnum(token["pixel_y"])
// CHOMPAdd End
/datum/persistent/filth/CheckTurfContents(var/turf/T, var/list/token)
var/_path = token["path"]
return (locate(_path) in T) ? FALSE : TRUE
// CHOMPEdit Start - Cooler graffitis
// return (locate(_path) in T) ? FALSE : TRUE
if(!ispath(_path, /obj/effect/decal/cleanable/crayon))
return (locate(_path) in T) ? FALSE : TRUE
// Crayon drawings aren't handled in graffiti, so we need to check if someone made "art" seperately from blood, dirt, etc.
var/too_much_crayon = 0
for(var/obj/effect/decal/cleanable/crayon/C in T)
too_much_crayon++
if(too_much_crayon >= 5)
return FALSE
return TRUE
// CHOMPEdit End
/datum/persistent/filth/CreateEntryInstance(var/turf/creating, var/list/token)
var/_path = token["path"]
new _path(creating, token["age"]+1)
// CHOMPEdit Start
// new _path(creating, token["age"]+1)
var/atom/inst = new _path(creating, token["age"]+1)
if(token["pixel_x"])
inst.pixel_x = token["pixel_x"]
if(token["pixel_y"])
inst.pixel_y = token["pixel_y"]
if(istype(inst, /obj/effect/decal/cleanable/crayon))
var/obj/effect/decal/cleanable/crayon/Crayart = inst
if(token["art_type"])
Crayart.art_type = token["art_type"]
if(token["art_color"])
Crayart.art_color = token["art_color"]
if(token["art_shade"])
Crayart.art_shade = token["art_shade"]
Crayart.update_icon()
// CHOMPEdit End
/datum/persistent/filth/GetEntryAge(var/atom/entry)
var/obj/effect/decal/cleanable/filth = entry
@@ -29,4 +73,20 @@
/datum/persistent/filth/CompileEntry(var/atom/entry)
. = ..()
LAZYADDASSOC(., "path", "[GetEntryPath(entry)]")
LAZYADDASSOC(., "path", "[GetEntryPath(entry)]")
// CHOMPAdd Start - Cooler graffiti
to_world("path is [GetEntryPath(entry)]")
LAZYADDASSOC(., "pixel_x", "[entry.pixel_x]")
to_world("pixel_x is [entry.pixel_x]")
LAZYADDASSOC(., "pixel_y", "[entry.pixel_y]")
to_world("pixel_y is [entry.pixel_y]")
if(istype(entry, /obj/effect/decal/cleanable/crayon))
var/obj/effect/decal/cleanable/crayon/Inst = entry
LAZYADDASSOC(., "art_type", "[Inst.art_type]")
to_world("art type is [Inst.art_type]")
LAZYADDASSOC(., "art_color", "[Inst.art_color]")
to_world("art color is [Inst.art_color]")
LAZYADDASSOC(., "art_shade", "[Inst.art_shade]")
to_world("art shade is [Inst.art_shade]")
// CHOMPAdd End