Commit Graph

19834 Commits

Author SHA1 Message Date
kappa-sama 933916a386 e 2020-01-08 09:46:58 -05:00
kappa-sama b3e916cc68 e 2020-01-08 09:44:16 -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 fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
Seris02 83eff39063 nope 2020-01-08 17:20:58 +08:00
Putnam 12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -08:00
Putnam a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
Putnam 26064e0992 crap 2020-01-07 17:37:57 -08:00
deathride58 89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58 f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58 633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05: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
Lin c162e9bb5d Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
2020-01-07 19:37:49 +00: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 f6fef84984 Make the RCD effect not right-clickable. 2020-01-07 11:23:25 -05: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
deathride58 cde9946e25 is this why wrench refuses to work 2020-01-07 09:00:30 -05:00
deathride58 686601334e suggested changes 2020-01-07 08:52:13 -05:00
kevinz000 0114f9e223 whitelist 2020-01-07 04:54:32 -08:00
kevinz000 fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000 ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Putnam 19887691f3 added deadchat toggle to dojo mobs too 2020-01-07 04:39:04 -08:00
kevinz000 5f7f1b09f3 Update observer.dm 2020-01-07 02:41:05 -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
Seris02 5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Putnam 70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -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
Putnam 6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
r4d6 68e48209da Fix 2020-01-07 02:04:06 -05:00
r4d6 20d5e4f480 Make the RCD show its upgrades on examination.
And remove a small copy-pasta.
2020-01-07 01:45:59 -05: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
r4d6 d7718c8dd1 Revert "Conflict Fix part 1"
This reverts commit 2ab07fdb82.
2020-01-06 23:43:27 -05:00
r4d6 2ab07fdb82 Conflict Fix part 1 2020-01-06 23:43:04 -05:00
kevinz000 62b8513795 fix 2020-01-06 19:50:46 -08:00