Commit Graph
60 Commits
Author SHA1 Message Date
ArturlangandGitHub 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Linzolle b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
JTGSZ 2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00
FermiandFermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
kevinz000andGitHub 0febc1977a Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
AnturKandLinzolle 12a691d950 Surgery cleanup (#40788)
* Surgery cleanup

* Proper mobtype
2019-09-22 12:05:26 -05:00
FermiandFermi 97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
XDTMandLinzolle 023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTMandLinzolle 8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
FermiandFermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
FermiandFermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Linzolle 5ab224e20a tweak values 2019-09-11 11:34:27 -05:00
Rob BaileyandLinzolle 5e94a5db80 ports #44155 from /tg/station 2019-08-24 20:21:44 -05:00
Fermi 44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +01:00
deathride58andkevinz000 1abeb42675 Reduces shadow species light threshold leniency to accommodate for cit lighting changes (#7719) 2018-11-16 14:56:42 -08:00
Poojawa 91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa 49467dbd72 Defines 2018-09-11 00:45:50 -05:00
kevinz000andGitHub 5ca76bc438 Update mobs.dm (#7109) 2018-06-15 02:49:28 -07:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Poojawa f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
Poojawaanddeathride58 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
CitadelStationBotandPoojawa 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
deathride58andGitHub a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
QustinnusandCitadelStationBot 68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
QustinnusandCitadelStationBot a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
CitadelStationBotandPoojawa 30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
Ashe HiggsandCitadelStationBot 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
vuonojenmustaturskaandCitadelStationBot afb1ab021b Removes SNPCs (#36016)
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
2018-02-28 00:12:12 -06:00
XDTMandCitadelStationBot bd6e8f0bbb Adds limitations to brain traumas (#35938)
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
2018-02-25 11:01:15 -06:00
CitadelStationBotandPoojawa 1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
deathride58andGitHub 329f70139c RESETS AGE_MIN TO 18 2018-02-08 13:56:38 -05:00
PoojawaandGitHub 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
coiaxandCitadelStationBot 6d9e8110f5 Mobs start with a random nutrition amount 2018-01-26 19:56:09 -06:00
LetterJay 9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
vuonojenmustaturskaandCitadelStationBot 8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -06:00
XDTMandCitadelStationBot 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
vuonojenmustaturskaandCitadelStationBot 360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 04:57:49 -05:00
MilitairesandCitadelStationBot c3e94b5e3d Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons 2017-10-15 15:34:49 -05:00
KorPhaeronandCitadelStationBot 4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
CitadelStationBotandkevinz000 94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
CitadelStationBotandkevinz000 4961966552 |SPECIES FOOD PREFERENCES| (#2232)
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
2017-08-21 20:23:30 -07:00
CitadelStationBot 0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -05:00
CitadelStationBot 4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBotandkevinz000 1ad4947e58 Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution (#1844) 2017-06-30 20:47:21 -07:00