Commit Graph

44 Commits

Author SHA1 Message Date
silicons 0152dcda65 fix 2020-07-28 13:24:45 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Hatterhat b60b0a95aa you ever just forget that if statements exist 2020-02-16 02:28:12 -06:00
Hatterhat 0f5ea361e7 bada bing bada boom 2020-02-15 14:07:35 -06:00
Hatterhat c9af8dc713 perhaps 2020-02-15 14:05:27 -06:00
Hatterhat 5a9208bc42 shit whoops 2020-02-14 16:29:17 -06:00
Hatterhat 3b873d4000 thanks ghommie 2020-02-14 16:28:39 -06:00
Hatterhat b2e3243760 there's no way this should have worked 2020-02-13 21:32:27 -06:00
Putnam c58b4daa35 collectors too
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
TrilbySpaceClone 688fabfffc Honk 2019-06-29 21:03:38 -04:00
kevinz000 a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
Sishen 555c1adf67 fix per kevs request 2019-06-28 08:20:59 -04:00
Ghommie 38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Sishen 934c1c0624 smite the heretics 2019-06-22 17:27:33 -04:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02: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
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -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
XDTM 493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -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
Jordan Brown 66bc684184 Merge pull request #34552 from Robustin/revert3
All crew can purify the Blood Bastard Sword (again)
2018-01-18 16:59:39 -06:00
Leo d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy
Fixes non-holy mobs purifying BBS
2018-01-10 03:12:16 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
oranges 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
Jordan Brown 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
XDTM 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
XDTM 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay f57929b26c Update book.dm 2017-10-04 21:14:25 -05:00
Robustin 1a53d9e524 2H Sword to the Cult Forge - Robustin's Github Adventure 2017-10-01 00:02:04 -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