69 Commits

Author SHA1 Message Date
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
kevinz000 1336404eb6 last ones 2020-06-17 21:37:19 -07:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
kevinz000 0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie 079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. 2020-03-06 19:05:45 +01:00
kevinz000 1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghom 038f5e4b0e Yea, sorry for being so naive right now. 2020-01-20 21:59:12 +01:00
Ghom a921b27c63 I want a different maintainer to merge this now. 2020-01-20 21:58:21 +01:00
Ghommie 9604b27482 github web editor is so bad 2020-01-20 21:55:02 +01:00
Ghom 9ea6e896fb Kevinz, please. 2020-01-20 21:43:00 +01:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Seris02 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000 2a304800df more reformatting 2020-01-07 11:46:32 -08:00
kevinz000 d461e70a9b Update life.dm 2020-01-06 23:45:39 -08:00
kevinz000 05c903e4a3 Update life.dm 2020-01-06 23:44:33 -08:00
kevinz000 a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Seris02 862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot a8b5d744e8 [MIRROR] RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself (#7084)
* RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself

* Update life.dm
2018-06-15 02:47:52 -07:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
deathride58 3921590a4b Update life.dm 2018-04-29 18:42:17 -04:00
vuonojenmustaturska 3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04: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 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJay 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
Robustin e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Robustin 7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -06:00
deathride58 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58 8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Emmett Gaines 04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00