Commit Graph

9531 Commits

Author SHA1 Message Date
CameronWoof d8c9dd967b Dolly Dress-Up: Ghost Hunter Edition 2019-12-30 14:31:47 -08:00
Putnam 5af513593c fixed conflict, included helpful flavor 2019-12-30 13:34:53 -08:00
Putnam 71fcd23f1f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 13:31:15 -08:00
Ghom e309497af2 Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
2019-12-30 18:24:50 +01:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Seris02 f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02 bebd1a4600 yee. 2019-12-30 23:52:36 +08:00
Ghom 110361f82b web-lazy-edit
I'm on another branch
2019-12-30 16:18:42 +01:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Seris02 714f76c8aa more changes 2019-12-30 18:48:29 +08:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam cb1403e095 oh yeah that's there too 2019-12-30 01:54:46 -08:00
Putnam 6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
KathrinBailey 283ccceb24 CE Locker Exodus: The Removaling
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
2019-12-30 09:25:03 +00:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000 fef66b1bd7 Merge pull request #10320 from Seris02/exclusion
excludes certain ghost roles from being affected by health events
2019-12-30 00:26:19 -08:00
kevinz000 47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
kevinz000 310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
Putnam a4c356ad57 added a cryo to the ghost cafe 2019-12-29 21:28:09 -08:00
Putnam cc087b990c Code improvements 2019-12-29 21:01:55 -08:00
Seris02 40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02 f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Putnam ddf233e0d5 Made no antags show up after auto call 2019-12-29 18:53:49 -08:00
Putnam 93207cae0b made "random" more random 2019-12-29 18:53:27 -08:00
Putnam fa35c5128c Rebalancing bloodsuckers a tad 2019-12-29 18:09:23 -08:00
Trilbyspaceclone 4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Putnam 68c9a371d9 Made story *purely* story, no extended-weighting 2019-12-29 10:56:48 -08:00
Seris02 b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02 9b3654e4ff telescopic IVs 2019-12-29 23:26:53 +08:00
Seris02 a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
BlackMajor 62b3c1e65b Makes pick up range work 2019-12-30 02:28:23 +13:00
BlackMajor 8948e0491e add mining card 2019-12-30 02:07:49 +13:00
BlackMajor b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
BlackMajor 375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor 2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
TrilbySpaceClone e71d23fc39 more fixes 2019-12-29 02:51:49 -05:00
BlackMajor 206a5e168a More mining changes 2019-12-29 20:15:49 +13:00
Putnam 0ac0558417 balancing is good 2019-12-28 20:16:14 -08:00
Putnam 00c7d5a41d WOW THAT'S A BIG NUMBER 2019-12-28 19:40:31 -08:00
Ghom f68d7fa1a3 Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks
Makes ghost cafe mobs actually a ghost role
2019-12-29 00:08:38 +01:00
TrilbySpaceClone 8aee20cdf3 Ready 2019-12-28 17:55:20 -05:00
Ghommie 7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie 37441437d1 a 2019-12-28 23:02:28 +01:00
Putnam a0374f82e2 Made a line use the dang macro 2019-12-28 13:55:54 -08:00
Seris02 1ff7709765 all of the weh. 2019-12-29 00:12:25 +08:00
Seris02 7bde63dcc4 weh 2019-12-28 23:58:28 +08:00
Seris02 0f38b79571 another small fix 2019-12-28 22:21:45 +08:00