f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
a38e6e88a0
Enables hulk smash.
2020-04-10 14:07:39 +02:00
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
1987cc56a2
Merge pull request #11712 from Ghommie/Ghommie-cit661
...
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-03 21:58:58 -07:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
519ebd5ed8
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-01 15:29:35 +02:00
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
f40f07b033
[READY]Skateboard overhaul ( #45657 )
...
* skeet skeet
* scoot
* removes debug message
* merge conflict
* oopsie
* polish, new board types
* begone
* actioninja review
* passtable trait
* fixes indent
* dwarfism check
* check for existing flag
* check existing trait
* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
2045fb86f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
2020-03-21 21:41:34 +01:00
332099953b
removes xray from the gene pool
2020-03-20 11:15:47 +08:00
4c87f2256c
genetics
2020-03-16 02:04:48 +01:00
29f7c9026f
buffies
2020-03-14 22:09:08 -04:00
88bdc6d068
Merge pull request #11440 from kevinz000/master_fix
...
fixes master
2020-03-12 01:54:15 +01:00
dbc54ab699
Update actions.dm
2020-03-12 01:47:51 +01:00
80b17cff1f
Merge branch 'master' into patch-17
2020-03-11 20:26:13 -04:00
067e2e4506
probably fixes hulk
2020-03-09 18:15:12 +08:00
9b66940807
fixes the web
2020-03-09 16:27:46 +08:00
3c7a9f068e
downvoted
2020-03-02 13:51:26 -05:00
8a647f8a8c
happy now?
2020-03-02 04:22:40 +08:00
b195783dfb
yeet 6
2020-02-28 14:31:47 +08:00
8140962275
yeet 4
2020-02-27 21:05:27 +08:00
d3385fb8c8
yeet 3
2020-02-27 21:03:50 +08:00
a14fe06241
probably fixes it
2020-02-27 20:51:19 +08:00
6e6b8fbd8a
yeet 2
2020-02-27 20:35:53 +08:00
9028169caf
fixed?
2020-02-22 20:16:40 +08:00
88ae429720
runtime fix
2020-02-22 19:45:57 +08:00
84d08fe122
firebreath change + update to tg genetics + calc patch
2020-02-22 19:42:33 +08:00
718ff58e0b
fixes + advanced injectors
2020-01-19 15:17:57 +08:00
862acf2f06
ports hyper's genetics
2019-12-28 21:33:15 +08:00
481371bca7
Merge pull request #10193 from Commandersand/yeet
...
gamer is now filtered for clowns
2019-12-20 13:15:54 +01:00
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
6f9be0c863
saves the world
2019-12-15 14:11:44 -06:00
0f40db60ce
honk
2019-12-15 03:38:00 -06:00
eb638adfa9
yw ghom
2019-12-09 10:10:14 -05:00
69884d1abe
Merge pull request #9062 from Trilbyspaceclone/patch-207
...
Makes smile not as horrable.
2019-08-11 10:08:45 -07:00
7a22e73a79
Update speech.dm
2019-08-06 08:47:10 -04:00
ec560c8371
Ports "More robust dorfs."
2019-07-31 22:14:39 +02:00
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
cb255b8719
give'r or leave'r, buddy.
2019-06-09 06:54:26 +02:00
c3fa360270
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43
2019-06-09 04:50:10 +02:00
7706ec6329
I LOVE THE SMELL OF NAPALM IN THE MORNING!
2019-06-09 02:45:14 +02:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
b6430559e9
datums
2018-09-11 02:49:41 -05:00
7755ebd0a0
Removes Low-Pressure Resistance from Cold-Res ( #7479 )
...
* Removes low-pressure resistance from Coldres
* Nerfs coldres
* adds a citadel change in the commented lines
2018-08-23 00:27:14 -07:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
e244438443
[MIRROR] Prevents tourettes from stacking ( #7253 )
...
* fixes tourettes being cancer (#38682 )
Prevents tourettes from stacking
* Prevents tourettes from stacking
2018-06-25 18:21:17 -07:00
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
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
Linzolle