Commit Graph

20 Commits

Author SHA1 Message Date
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
vuonojenmustaturska
9d4fe1d85c Merge pull request #37816 from YPOQ/bikehornfix
Fixes bike horn attack
2018-05-13 12:12:17 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturska
665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix
Fixes bikehorn mood event
2018-04-30 04:55:47 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [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
2018-03-19 21:33:18 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
CitadelStationBot
3a7d148417 [MIRROR] Soap now has inhand sprites (#5257)
* Soap now has inhand sprites (#35159)

* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm

* Soap now has inhand sprites
2018-02-04 22:35:31 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
LetterJay
985fdcd22d Update clown_items.dm 2017-10-27 23:56:37 -05:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
Mercenaryblue
ecd85a2de7 Golden Bike Horns now have a small delay between each flips. (#31652)
* flip timer on GBH

Added a slight timer on the flip effect, allowing its victims to finish the flip before being forced to jump again.

* GBH Fix 1.0.1

if (!flip_flag)

* world.time instead of a timer
2017-10-14 18:51:36 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00