Commit Graph

13933 Commits

Author SHA1 Message Date
Arturlang
cc174d91ec Reviewer suggestion
Co-Authored-By: Lin <linzolle@gmail.com>
2020-01-08 22:02:50 +02:00
Artur
e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur
039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
Trilbyspaceclone
5f5c45c0ff Update glass.dm 2020-01-08 13:01:51 -05:00
kappa-sama
933916a386 e 2020-01-08 09:46:58 -05:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00
Ghom
f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
2020-01-08 13:48:12 +01:00
Putnam
12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -08:00
Putnam
26064e0992 crap 2020-01-07 17:37:57 -08:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Putnam3145
b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor
05a644cc41 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
BlackMajor
972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor
b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
Artur
cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
kevinz000
5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
kevinz000
e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000
2a304800df more reformatting 2020-01-07 11:46:32 -08:00
r4d6
7c757900f2 Fix the category 2020-01-07 13:27:44 -05:00
Artur
97a9ad4714 Nerfs cloak some more 2020-01-07 19:22:39 +01:00
Artur
81f1349cea Nerf Stamina and cloneloss 2020-01-07 18:41:17 +01:00
Artur
7141223f49 All ready now, forgot how stat worked 2020-01-07 18:39:13 +01:00
r4d6
a91f31d9e6 Fix a typo 2020-01-07 11:21:00 -05:00
deathride58
6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
kevinz000
5f7f1b09f3 Update observer.dm 2020-01-07 02:41:05 -08:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
8a29c5a7a9 Update mob_defines.dm 2020-01-07 02:20:44 -08:00
kevinz000
91c8bb2e95 Update experiment.dm 2020-01-07 02:17:56 -08:00
kevinz000
b9260a62df Update observer.dm 2020-01-07 02:16:52 -08:00
kevinz000
5975f4c17d Update observer.dm 2020-01-07 02:12:47 -08:00
TrilbySpaceClone
6a2696f1f8 ghommie said 2020-01-07 03:10:22 -05: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
3efdf013e6 mobility flags 2020-01-06 21:47:27 -08:00
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
Trilbyspaceclone
f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
kevinz000
62b8513795 fix 2020-01-06 19:50:46 -08:00
kevinz000
82ca801c0c Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-06 19:50:21 -08:00
kevinz000
d1533d4d06 Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-06 19:49:46 -08:00
kevinz000
4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
2020-01-06 19:46:42 -08:00
BlackMajor
5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
keronshb
a7af5203e7 This is a test to see if they all work together
Title
2020-01-06 20:29:44 -05:00
keronshb
35cd77d433 Adds the nanite remote for some programs
Adds a new remote function from tg
2020-01-06 20:28:33 -05:00
Lin
2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
Artur
d283532d97 Removes tresspass handcuff removal 2020-01-06 20:49:14 +01:00
Artur
41f96c0dc9 Whoopsie 2020-01-06 20:31:55 +01:00
Artur
4fc6aa10be Adds a cooldown for revival 2020-01-06 20:29:10 +01:00