mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-08 00:21:43 +00:00
* refactor: Movement cross/uncross implementation.
* wrong var name
* fix unit tests dropping PDAs into nowhere
* Add documentation.
* remove unused constants
* say which procs are off limits
* fix simpleanimal z change runtime
* helps not to leave merge conflicts
* kill me
* fix typecast
* fix projectile/table collision
* treadmills don't cause MC to crash anymore
* connect_loc is appropriate here
* fix windoors and teleporters
* fix bonfires and clarify docs
* fix proximity sensors
Tested with sensors in crates, sensors in modsuits
Tested new proximity component with firing projectiles at singularity
Tested new proximity component with portable flashes
Tested new proximity component with facehuggers
* lint
* fix: polarized access helper false positives
* Revert "fix: polarized access helper false positives"
This reverts commit 9814f98cf6.
* hopefully the right change for mindflayer steam
* Changes following cameras
* fix glass table collision
* appears to fix doorspam
* fix ore bags not picking up ore
* fix signatures of /Exited
* remove debug log
* remove duplicate signal registrar
* fix emptying bags into locations
* I don't trust these nested Move calls
* use connect_loc for upgraded resonator fields
* use moveToNullspace
* fix spiderweb crossing
* fix pass checking for windows from a tile off
* fix bluespace closet/transparency issues
* fix mechs not interacting with doors and probably other things
* fix debug
* fix telepete
* add some docs
* stop trying to shoehorn prox monitor into cards
* I should make sure things build
* kill override signal warning
* undef signal
* not many prox monitors survive going off like this
* small fixes to storage
* make moving wormholes respect signals
* use correct signals for pulse demon
* fix pulse heart too
* fix smoke signals
* may have fucked singulo projectile swerve
* fix singulo projectile arcing
* remove duplicate define
* just look at it
* hopefully last cleanups of incorrect signal usage
* fix squeaking
* may god have mercy on my soul
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
* lewc review
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
* burza review
* fix bad args for grenade assemblies
* Update code/__DEFINES/is_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
334 lines
8.4 KiB
Plaintext
334 lines
8.4 KiB
Plaintext
#define ALWAYS_IN_GRAVITY 3
|
|
|
|
/obj/effect/decal/cleanable/generic
|
|
name = "clutter"
|
|
desc = "Someone should clean that up."
|
|
gender = PLURAL
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "shards"
|
|
|
|
/obj/effect/decal/cleanable/ash
|
|
name = "ashes"
|
|
desc = "Ashes to ashes, dust to dust, and into space."
|
|
gender = PLURAL
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "ash"
|
|
scoop_reagents = list("ash" = 10)
|
|
mergeable_decal = FALSE
|
|
plane = GAME_PLANE
|
|
|
|
/obj/effect/decal/cleanable/glass
|
|
name = "tiny shards"
|
|
desc = "Back to sand."
|
|
icon = 'icons/obj/shards.dmi'
|
|
icon_state = "tiny"
|
|
plane = GAME_PLANE
|
|
|
|
/obj/effect/decal/cleanable/glass/Initialize(mapload)
|
|
. = ..()
|
|
setDir(pick(GLOB.cardinal))
|
|
|
|
/obj/effect/decal/cleanable/glass/ex_act()
|
|
qdel(src)
|
|
|
|
/obj/effect/decal/cleanable/glass/plasma
|
|
icon_state = "plasmatiny"
|
|
|
|
/obj/effect/decal/cleanable/dirt
|
|
name = "dirt"
|
|
desc = "Someone should clean that up."
|
|
gender = PLURAL
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/effects/dirt.dmi'
|
|
icon_state = "dirt"
|
|
base_icon_state = "dirt"
|
|
smoothing_flags = NONE
|
|
smoothing_groups = list(SMOOTH_GROUP_CLEANABLE_DIRT)
|
|
canSmoothWith = list(SMOOTH_GROUP_CLEANABLE_DIRT, SMOOTH_GROUP_WALLS)
|
|
mouse_opacity = FALSE
|
|
|
|
/obj/effect/decal/cleanable/dirt/Initialize(mapload)
|
|
. = ..()
|
|
QUEUE_SMOOTH_NEIGHBORS(src)
|
|
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
|
|
QUEUE_SMOOTH_NEIGHBORS(src)
|
|
|
|
/obj/effect/decal/cleanable/dirt/Destroy()
|
|
QUEUE_SMOOTH_NEIGHBORS(src)
|
|
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
|
|
QUEUE_SMOOTH_NEIGHBORS(src)
|
|
return ..()
|
|
|
|
/obj/effect/decal/cleanable/dirt/blackpowder
|
|
name = "black powder"
|
|
mouse_opacity = TRUE
|
|
no_scoop = TRUE
|
|
scoop_reagents = list("blackpowder" = 40) // size 2 explosion when activated
|
|
|
|
/obj/effect/decal/cleanable/flour
|
|
name = "flour"
|
|
desc = "It's still good. Four second rule!"
|
|
gender = PLURAL
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "flour"
|
|
|
|
/obj/effect/decal/cleanable/flour/nanofrost
|
|
name = "nanofrost residue"
|
|
desc = "Residue left behind from a nanofrost detonation. Perhaps there was a fire here?"
|
|
color = "#B2FFFF"
|
|
|
|
/obj/effect/decal/cleanable/flour/foam
|
|
name = "Fire fighting foam"
|
|
desc = "It's foam."
|
|
color = "#EBEBEB"
|
|
|
|
/obj/effect/decal/cleanable/flour/foam/Initialize(mapload)
|
|
. = ..()
|
|
QDEL_IN(src, 15 SECONDS)
|
|
|
|
/obj/effect/decal/cleanable/greenglow
|
|
name = "glowing goo"
|
|
desc = "Jeez. I hope that's not for lunch."
|
|
gender = PLURAL
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
light_range = 1
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "greenglow"
|
|
|
|
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
|
|
. = ..()
|
|
QDEL_IN(src, 2 MINUTES)
|
|
|
|
/obj/effect/decal/cleanable/greenglow/ex_act()
|
|
return
|
|
|
|
/obj/effect/decal/cleanable/cobweb
|
|
name = "cobweb"
|
|
desc = "Somebody should remove that."
|
|
density = FALSE
|
|
layer = OBJ_LAYER
|
|
plane = GAME_PLANE
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "cobweb1"
|
|
resistance_flags = FLAMMABLE
|
|
|
|
/obj/effect/decal/cleanable/molten_object
|
|
name = "gooey grey mass"
|
|
desc = "It looks like a melted... something."
|
|
density = FALSE
|
|
layer = OBJ_LAYER
|
|
plane = GAME_PLANE
|
|
gender = NEUTER
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "molten"
|
|
mergeable_decal = FALSE
|
|
|
|
/obj/effect/decal/cleanable/molten_object/large
|
|
name = "big gooey grey mass"
|
|
icon_state = "big_molten"
|
|
|
|
/obj/effect/decal/cleanable/cobweb2
|
|
name = "cobweb"
|
|
desc = "Somebody should remove that."
|
|
density = FALSE
|
|
layer = OBJ_LAYER
|
|
plane = GAME_PLANE
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "cobweb2"
|
|
|
|
/obj/effect/decal/cleanable/vomit
|
|
name = "vomit"
|
|
desc = "Gosh, how unpleasant."
|
|
gender = PLURAL
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
plane = FLOOR_PLANE
|
|
icon = 'icons/effects/blood.dmi'
|
|
icon_state = "vomit_1"
|
|
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
|
|
no_clear = TRUE
|
|
scoop_reagents = list("vomit" = 5)
|
|
|
|
|
|
/obj/effect/decal/cleanable/vomit/Initialize(mapload)
|
|
. = ..()
|
|
var/turf/T = get_turf(src)
|
|
gravity_check = has_gravity(src, T)
|
|
if(loc != T)
|
|
forceMove(T)
|
|
if(!gravity_check)
|
|
layer = MOB_LAYER
|
|
plane = GAME_PLANE
|
|
if(prob(50))
|
|
animate_float(src, -1, rand(30, 120))
|
|
else
|
|
animate_levitate(src, -1, rand(30, 120))
|
|
icon = 'icons/effects/blood_weightless.dmi'
|
|
|
|
var/static/list/loc_connections = list(
|
|
COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered)
|
|
)
|
|
AddElement(/datum/element/connect_loc, loc_connections)
|
|
|
|
/obj/effect/decal/cleanable/vomit/Bump(atom/A)
|
|
. = ..()
|
|
if(A.density)
|
|
splat(A)
|
|
|
|
/obj/effect/decal/cleanable/vomit/proc/on_atom_entered(datum/source, atom/movable/entered)
|
|
if(!gravity_check)
|
|
splat(entered)
|
|
|
|
/obj/effect/decal/cleanable/vomit/proc/splat(atom/A)
|
|
if(gravity_check)
|
|
return
|
|
var/turf/T = get_turf(A)
|
|
if(should_merge_decal(T))
|
|
qdel(src)
|
|
return
|
|
if(loc != T)
|
|
forceMove(T)
|
|
icon = initial(icon)
|
|
gravity_check = ALWAYS_IN_GRAVITY
|
|
if(T.density || locate(/obj/structure/window) in T)
|
|
layer = ABOVE_WINDOW_LAYER
|
|
plane = GAME_PLANE
|
|
else
|
|
layer = initial(layer)
|
|
plane = initial(plane)
|
|
animate(src)
|
|
|
|
/obj/effect/decal/cleanable/vomit/Process_Spacemove(movement_dir)
|
|
if(gravity_check)
|
|
return 1
|
|
|
|
if(has_gravity(src))
|
|
if(!gravity_check)
|
|
splat(get_step(src, movement_dir))
|
|
return 1
|
|
|
|
if(pulledby && !pulledby.pulling)
|
|
return 1
|
|
|
|
if(throwing)
|
|
return 1
|
|
|
|
return 0
|
|
|
|
/obj/effect/decal/cleanable/vomit/green
|
|
name = "green vomit"
|
|
desc = "It's all gummy. Ew."
|
|
icon_state = "gvomit_1"
|
|
random_icon_states = list("gvomit_1", "gvomit_2", "gvomit_3", "gvomit_4")
|
|
scoop_reagents = list("green_vomit" = 5)
|
|
|
|
/obj/effect/decal/cleanable/shreds
|
|
name = "shreds"
|
|
desc = "The shredded remains of what appears to be clothing."
|
|
icon_state = "shreds"
|
|
gender = PLURAL
|
|
plane = GAME_PLANE
|
|
mergeable_decal = FALSE
|
|
|
|
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
|
|
if(severity == EXPLODE_DEVASTATE) //so shreds created during an explosion aren't deleted by the explosion.
|
|
qdel(src)
|
|
|
|
/obj/effect/decal/cleanable/shreds/Initialize(mapload)
|
|
pixel_x = rand(-10, 10)
|
|
pixel_y = rand(-10, 10)
|
|
. = ..()
|
|
|
|
/obj/effect/decal/cleanable/tomato_smudge
|
|
name = "tomato smudge"
|
|
desc = "It's red."
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
|
|
|
|
/obj/effect/decal/cleanable/plant_smudge
|
|
name = "plant smudge"
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
gender = NEUTER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_plant")
|
|
|
|
/obj/effect/decal/cleanable/egg_smudge
|
|
name = "smashed egg"
|
|
desc = "Seems like this one won't hatch."
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
|
|
|
|
/// honk
|
|
/obj/effect/decal/cleanable/pie_smudge
|
|
name = "smashed pie"
|
|
desc = "It's pie cream from a cream pie."
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_pie")
|
|
|
|
/obj/effect/decal/cleanable/fungus
|
|
name = "space fungus"
|
|
desc = "A fungal growth. Looks pretty nasty."
|
|
density = FALSE
|
|
layer = TURF_LAYER
|
|
plane = GAME_PLANE
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "flour"
|
|
color = "#D5820B"
|
|
scoop_reagents = list("fungus" = 10)
|
|
no_clear = TRUE
|
|
var/timer_id
|
|
|
|
/obj/effect/decal/cleanable/fungus/examine(mob/user)
|
|
. = ..()
|
|
if(no_scoop)
|
|
. += "<span class='notice'>There's not a lot here, you probably wouldn't be able to harvest anything useful.</span>"
|
|
else
|
|
. += "<span class='notice'>There's enough here to scrape into a beaker.</span>"
|
|
|
|
/obj/effect/decal/cleanable/fungus/on_scoop()
|
|
alpha = 128
|
|
no_scoop = TRUE
|
|
|
|
timer_id = addtimer(CALLBACK(src, PROC_REF(recreate)), rand(5 MINUTES, 10 MINUTES), TIMER_STOPPABLE)
|
|
|
|
/obj/effect/decal/cleanable/fungus/Destroy()
|
|
. = ..()
|
|
deltimer(timer_id)
|
|
|
|
/obj/effect/decal/cleanable/fungus/proc/recreate()
|
|
alpha = 255
|
|
reagents.add_reagent_list(scoop_reagents)
|
|
no_scoop = FALSE
|
|
|
|
/// PARTY TIME!
|
|
/obj/effect/decal/cleanable/confetti
|
|
name = "confetti"
|
|
desc = "Party time!"
|
|
gender = PLURAL
|
|
plane = GAME_PLANE
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "confetti1"
|
|
random_icon_states = list("confetti1", "confetti2", "confetti3")
|
|
|
|
/obj/effect/decal/cleanable/insectguts
|
|
name = "bug guts"
|
|
desc = "One bug squashed. Four more will rise in its place."
|
|
icon = 'icons/effects/blood.dmi'
|
|
icon_state = "xfloor1"
|
|
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
|
|
|
|
#undef ALWAYS_IN_GRAVITY
|