Commit Graph

235 Commits

Author SHA1 Message Date
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Qustinnus
f79de1ec9b Adjusts the behavior of Mood on sanity (#36640)
cl Floyd / Qustinnus
balance: Changes rate of sanity drain and caps it depending on mood
/cl
Kor gave me permission to work on mood during the freeze so I could stop the fuckload of people that ping me 5 times with insults.

If you are only slightly sad, you wont go insane, but go to a cap, to go insane you /need/ to be in a bad mood at the same time, or you will go back to sane really fast. Also sanity drain rates lowered.

Also if there's bugs/issues with mood just make an issue on the issue trackers, I dont need you pinging me at 4AM to tell me how I'm horrid at things. It'll just make me get a headache. I'm making PRs in good faith, not to annoy the playerbase. The same respect in return would be appreciated.

If mood doesn't work out after this the Headmins will turn off the config, and I'll look into either rebalancing it or repurposing it.
2018-03-23 18:51:09 +13:00
Qustinnus
4911991f70 [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.
2018-03-18 19:48:50 +13:00
Qustinnus
0bc8550e1c Small moodie balance changes (#36242)
* quickfixes

* mooddefines

* im dumb

* zzz i sleep
2018-03-08 17:39:33 +13:00
Qustinnus
5140cff38c [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)

add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states


What this PR is

This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:

    Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
    Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
    Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
    Hunger rate - You gain hunger slower if you are very happy.
2018-03-08 14:15:57 +13:00
Cruix
dedf5f5ed9 Disease antagonist (#35988)
* Virus antagonist initial commit

* Updated disease code

* Sentient virus improvements

* Renamed /mob/living/var/viruses to diseases, and /mob/living/var/resistances to disease_resistances

* Added sentient virus event

* Renamed VIRUS defines to DISEASE defines

* Fixed bugs in rewritten disease code

* Fixed advanced disease Copy()

* Finalized disease antagonist

* Made cooldown buttons stop processing if they are removed from an owner.
Made sentient disease active sneeze and cough not available if the host is unconscious.
Made sentient disease menu refresh when adaptations are ready or hosts are added or removed.
Made sentient disease following use movement signals instead of fastprocess.

* Added better icons to sentient disease abilities
2018-03-05 13:55:10 +01:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
nicbn
dc09b1763e Adds tiny shards (#35070)
* Adds tiny shards

* .

* .

* .

* .

* .

* .
2018-02-04 02:40:01 -06:00
Jittai
df1a99ed8d [READY] Fixes de-initialization of cleanables-ash (#35191)
* Fixes de-initialization of cleanables-ash

* boop

* :x

* better execution

* prevent pile-up

* special ash

* comment cleanup

* cleanup 2
2018-02-04 02:12:22 -06:00
ShizCalev
50123b1e52 Allows blobs to destroy decals 2018-02-03 21:21:15 -06:00
vuonojenmustaturska
33aa1696d6 Lavaland bomb runtime fix (#35183)
* lavaland bomb runtime fix

* revert previous commit, fix decals instead

* remove stray return
2018-02-01 13:30:41 +01:00
ChuckTheJittai
254729a144 Retrying #35068 2018-01-28 15:02:03 -05:00
BordListian
740c4a0337 Adds firefighting foam, a better alternative to water for fighting fires. (#34788) 2018-01-26 22:16:32 +02:00
ninjanomnom
34d3c0a4ba makes the point effect not trigger movement code 2018-01-23 05:59:32 -05:00
ShizCalev
e544a60d13 Corrects tile color defines 2018-01-19 12:44:28 -05:00
deathride58
fbb5acd7a3 Ports Aurora's floor tile color turf decals (For mappers) (#34492)
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
2018-01-18 22:28:06 -05:00
XDTM
76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
Jordan Brown
9c20306439 Fixes decals being created on bad turfs (#34121)
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
2018-01-07 19:50:36 -05:00
deathride58
d549641aec allows multiple crayon decals on a single tile 2018-01-01 19:58:59 -05:00
kevinz000
05be346f8a Component Forensics, Blood Decals, and Cleaning 2017-12-24 18:19:43 -08:00
vuonojenmustaturska
a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
WJohn
84f0306761 Cleans up floors.dmi a bit and adds new turf decals. (#32860)
* Updates floors and decals as well as all relevant maps.

* Fixes centcom compilation errors

* Fixes some missing floors I did not see under blast doors whoops.

* Removes a bunch of tags reeeee

* Removes redundant icon states.

* Updates almost all maps, mostly to deal with /black being changed to /dark.

* Fixes pirate ship too.

* Let's try that again fuck

* Whoops extra area error

* Proper conflict fixes.

* Actual fixes now

* Actual fixes.

* Last couple of fixes hopefully at ninja's request.
2017-11-20 21:47:33 -05:00
swindly
1ef9667358 Generalizes some reagent heating (#32461)
* adds expose_temperature

* changed chem_temp change

* returns ..()

* removed redundant handle_reactions()
2017-11-08 12:04:33 -05:00
ShizCalev
04fa4eaf4c Fixes turf_decal layering (#32466) 2017-11-07 22:38:39 -05:00
ninjanomnom
db6a0ed825 cleans up turf decal 2017-11-07 11:23:01 -05:00
Jordie
8c3948b427 Crayon rotation as a type var (#32441) 2017-11-07 12:03:18 -02:00
Emmett Gaines
4d420b8975 Shuttle rotation refactor and significant performance upgrade (#31942)
* Shuttle rotation refactor

* cleanup

* fixes the air leak bug

* Updates the turf decal component and cleans up some code

* transfercomponents and some list optimization

* Makes turf_decals cleanable in theory

* review cleanup

* final cleanup: decals work
2017-10-31 21:23:17 -04:00
Kyle Spier-Swenson
874011d3ae Fixes excessive overlay churn (#32065)
* Fixes excessive overlay chern

Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.

This is likely the cause of overlays being so high.

* I APOLOGIZE FOR NOTHING!
2017-10-25 22:44:50 -04:00
ShizCalev
e865b3b8d6 Makes dust remains cleanable with acid. (#31875)
* Makes remains cleanable with acid

* I AM ALTERING THE DEAL.

* Acid act
2017-10-20 08:40:34 +02:00
ShizCalev
721df8dacf Cleans up some istypes not using helpers 2017-10-16 15:30:30 -04:00
Tad Hardesty
13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
XDTM
db0c10ea58 Refactors virus spreading (#31066)
* Refactors virus spreading

* Cyberfixes

* Bump to infect

* proper shoe protection

* Split ContractDisease

* Makes virus severity matter

* oops

* Virus severity changes

* defines

* infective_floor --> infective

* Fixes vomit and pulling infection
2017-10-09 14:08:21 +02:00
ShizCalev
41430d70db Sets decal layer 2017-10-06 03:11:32 -05:00
vuonojenmustaturska
6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04:00
MoreRobustThanYou
c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
kevinz000
169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYou
0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Kyle Spier-Swenson
f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
shizcalev
065bda1cc2 things 2017-07-25 22:26:51 -04:00
Fox McCloud
2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Jordan Brown
af13f405bd Fixes bloody footprints runtime (#28372) 2017-06-13 09:47:40 +02:00
Jordan Brown
652d7b6ade Fixes decal initialize errors (#28370) 2017-06-13 09:45:29 +02:00
Jordan Brown
23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
kevinz000
f756b6b9c2 the question is now , does this work? 2017-06-02 00:51:10 -07:00
kevinz000
6e5f20f58e thanks, robustin! 2017-06-01 23:07:07 -07:00