dad2d44ea2
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344) cl Floyd / Qustinnus del: Removes short-term effects of mood add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room. refactor: Removes the original way of adding mood events, uses signals properly instead. fix: Cleanables "giving" area's free beauty during initialization fix: Fixes some events not clearing properly /cl Fixes #36444 From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before. This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later. I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example. * [READY] Several fixes/changes to mood, longterm mood effects, beauty component
224 lines
6.1 KiB
Plaintext
224 lines
6.1 KiB
Plaintext
/obj/effect/decal/cleanable/generic
|
|
name = "clutter"
|
|
desc = "Someone should clean that up."
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "shards"
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/ash
|
|
name = "ashes"
|
|
desc = "Ashes to ashes, dust to dust, and into space."
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "ash"
|
|
mergeable_decal = FALSE
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/ash/Initialize()
|
|
. = ..()
|
|
reagents.add_reagent("ash", 30)
|
|
pixel_x = rand(-5, 5)
|
|
pixel_y = rand(-5, 5)
|
|
|
|
/obj/effect/decal/cleanable/ash/crematorium
|
|
//crematoriums need their own ash cause default ash deletes itself if created in an obj
|
|
turf_loc_check = FALSE
|
|
|
|
/obj/effect/decal/cleanable/ash/large
|
|
name = "large pile of ashes"
|
|
icon_state = "big_ash"
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/ash/large/Initialize()
|
|
. = ..()
|
|
reagents.add_reagent("ash", 30) //double the amount of ash.
|
|
|
|
/obj/effect/decal/cleanable/glass
|
|
name = "tiny shards"
|
|
desc = "Back to sand."
|
|
icon = 'icons/obj/shards.dmi'
|
|
icon_state = "tiny"
|
|
beauty = -125
|
|
|
|
/obj/effect/decal/cleanable/glass/Initialize()
|
|
. = ..()
|
|
setDir(pick(GLOB.cardinals))
|
|
|
|
/obj/effect/decal/cleanable/glass/ex_act()
|
|
qdel(src)
|
|
|
|
/obj/effect/decal/cleanable/dirt
|
|
name = "dirt"
|
|
desc = "Someone should clean that up."
|
|
icon_state = "dirt"
|
|
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/flour
|
|
name = "flour"
|
|
desc = "It's still good. Four second rule!"
|
|
icon_state = "flour"
|
|
beauty = -100
|
|
|
|
/obj/effect/decal/cleanable/greenglow
|
|
name = "glowing goo"
|
|
desc = "Jeez. I hope that's not for lunch."
|
|
light_color = LIGHT_COLOR_GREEN
|
|
icon_state = "greenglow"
|
|
beauty = -200
|
|
|
|
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
|
|
. = ..()
|
|
set_light(1)
|
|
|
|
/obj/effect/decal/cleanable/greenglow/ex_act()
|
|
return
|
|
|
|
/obj/effect/decal/cleanable/cobweb
|
|
name = "cobweb"
|
|
desc = "Somebody should remove that."
|
|
gender = NEUTER
|
|
layer = WALL_OBJ_LAYER
|
|
icon_state = "cobweb1"
|
|
resistance_flags = FLAMMABLE
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/cobweb/cobweb2
|
|
icon_state = "cobweb2"
|
|
|
|
/obj/effect/decal/cleanable/molten_object
|
|
name = "gooey grey mass"
|
|
desc = "It looks like a melted... something."
|
|
gender = NEUTER
|
|
icon = 'icons/effects/effects.dmi'
|
|
icon_state = "molten"
|
|
mergeable_decal = FALSE
|
|
beauty = -300
|
|
|
|
/obj/effect/decal/cleanable/molten_object/large
|
|
name = "big gooey grey mass"
|
|
icon_state = "big_molten"
|
|
beauty = -450
|
|
|
|
//Vomit (sorry)
|
|
/obj/effect/decal/cleanable/vomit
|
|
name = "vomit"
|
|
desc = "Gosh, how unpleasant."
|
|
icon = 'icons/effects/blood.dmi'
|
|
icon_state = "vomit_1"
|
|
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
|
|
beauty = -600
|
|
|
|
/obj/effect/decal/cleanable/vomit/attack_hand(mob/user)
|
|
if(ishuman(user))
|
|
var/mob/living/carbon/human/H = user
|
|
if(isflyperson(H))
|
|
playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //slurp
|
|
H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>")
|
|
if(reagents)
|
|
for(var/datum/reagent/R in reagents.reagent_list)
|
|
if (istype(R, /datum/reagent/consumable))
|
|
var/datum/reagent/consumable/nutri_check = R
|
|
if(nutri_check.nutriment_factor >0)
|
|
H.nutrition += nutri_check.nutriment_factor * nutri_check.volume
|
|
reagents.remove_reagent(nutri_check.id,nutri_check.volume)
|
|
reagents.trans_to(H, reagents.total_volume)
|
|
qdel(src)
|
|
|
|
/obj/effect/decal/cleanable/vomit/old
|
|
name = "crusty dried vomit"
|
|
desc = "You try not to look at the chunks, and fail."
|
|
|
|
/obj/effect/decal/cleanable/vomit/old/Initialize(mapload, list/datum/disease/diseases)
|
|
. = ..()
|
|
icon_state += "-old"
|
|
|
|
/obj/effect/decal/cleanable/tomato_smudge
|
|
name = "tomato smudge"
|
|
desc = "It's red."
|
|
gender = NEUTER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
|
|
beauty = -125
|
|
|
|
/obj/effect/decal/cleanable/plant_smudge
|
|
name = "plant smudge"
|
|
gender = NEUTER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_plant")
|
|
beauty = -125
|
|
|
|
/obj/effect/decal/cleanable/egg_smudge
|
|
name = "smashed egg"
|
|
desc = "Seems like this one won't hatch."
|
|
gender = NEUTER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
|
|
beauty = -125
|
|
|
|
/obj/effect/decal/cleanable/pie_smudge //honk
|
|
name = "smashed pie"
|
|
desc = "It's pie cream from a cream pie."
|
|
gender = NEUTER
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
random_icon_states = list("smashed_pie")
|
|
beauty = -200
|
|
|
|
/obj/effect/decal/cleanable/chem_pile
|
|
name = "chemical pile"
|
|
desc = "A pile of chemicals. You can't quite tell what's inside it."
|
|
gender = NEUTER
|
|
icon = 'icons/obj/objects.dmi'
|
|
icon_state = "ash"
|
|
beauty = -200
|
|
|
|
/obj/effect/decal/cleanable/shreds
|
|
name = "shreds"
|
|
desc = "The shredded remains of what appears to be clothing."
|
|
icon_state = "shreds"
|
|
gender = PLURAL
|
|
mergeable_decal = FALSE
|
|
beauty = -200
|
|
|
|
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
|
|
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
|
|
qdel(src)
|
|
|
|
/obj/effect/decal/cleanable/shreds/Initialize()
|
|
pixel_x = rand(-10, 10)
|
|
pixel_y = rand(-10, 10)
|
|
. = ..()
|
|
|
|
/obj/effect/decal/cleanable/salt
|
|
name = "salt pile"
|
|
desc = "A sizable pile of table salt. Someone must be upset."
|
|
icon = 'icons/effects/tomatodecal.dmi'
|
|
icon_state = "salt_pile"
|
|
gender = NEUTER
|
|
beauty = -125
|
|
|
|
/obj/effect/decal/cleanable/glitter
|
|
name = "generic glitter pile"
|
|
desc = "The herpes of arts and crafts."
|
|
icon = 'icons/effects/tile_effects.dmi'
|
|
gender = NEUTER
|
|
beauty = 300
|
|
|
|
/obj/effect/decal/cleanable/glitter/pink
|
|
name = "pink glitter"
|
|
icon_state = "plasma"
|
|
|
|
/obj/effect/decal/cleanable/glitter/white
|
|
name = "white glitter"
|
|
icon_state = "nitrous_oxide"
|
|
|
|
/obj/effect/decal/cleanable/glitter/blue
|
|
name = "blue glitter"
|
|
icon_state = "freon"
|
|
|
|
/obj/effect/decal/cleanable/plasma
|
|
name = "stabilized plasma"
|
|
desc = "A puddle of stabilized plasma."
|
|
icon_state = "flour"
|
|
color = "#C8A5DC"
|
|
beauty = -200
|