KathrinBailey
243aebe12a
dab 2x
2019-12-31 16:54:59 +00:00
KathrinBailey
0a19f62fa9
dab
2019-12-31 16:45:06 +00:00
KathrinBailey
f2e9ba2a8e
Makes lockers into subtypes
...
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
Ghom and GitHub
0453363d4c
Merge pull request #10345 from Trilbyspaceclone/patch-256
...
Buffs bandoliers to hold more types of casings.
2019-12-31 14:36:53 +01:00
Ghom and GitHub
78e4c608ad
Merge pull request #10319 from Seris02/coconutsyep
...
porting azarak's coconuts from hyper station
2019-12-31 13:16:07 +01:00
Putnam
cf77f7b18e
Balance pass (see description)
...
1. Made bloodsuckers more likely on calm, story, slightly more common on intrigue
2. Made intrigue no longer have low threat by default
3. Made abductors have lower weights in general, making them less likely to show up
4. Made sentient disease, revenant less likely on calm
5. Added a new storyteller, "Conversion", which rolls conversion antags.
2019-12-31 02:40:50 -08:00
BlackMajor
8085022d97
Couple of changes. Starting on the point bank.
2019-12-31 23:28:30 +13:00
Trilbyspaceclone and GitHub
c81d0e8b66
Update energy.dm
2019-12-31 05:25:12 -05:00
Hatterhat
5a497b02ac
hey i'm WALKIN here
2019-12-31 01:56:01 -06:00
kevinz000 and GitHub
79c609aa40
Update telescopic_iv.dm
2019-12-30 17:55:59 -08:00
Putnam
018904694f
caps
2019-12-30 17:03:06 -08:00
nik707 and GitHub
5c13fa64e3
Merge pull request #10338 from Seris02/marshmallow
...
marshmallow
2019-12-30 18:31:06 -06:00
nik707 and GitHub
8a4e44758f
Merge pull request #10165 from Ghommie/Ghommie-cit456
...
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
nik707 and GitHub
23f79ffed8
Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
...
throwing now only randomly turns things if you are on harm intent
2019-12-30 18:28:16 -06:00
Putnam
b5ccbe86c0
Halved midround antag injection chance on calm
2019-12-30 15:40:20 -08:00
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 and GitHub
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 and GitHub
f0ba93052d
yee2.
2019-12-30 23:53:10 +08:00
Seris02 and GitHub
bebd1a4600
yee.
2019-12-30 23:52:36 +08: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
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 and GitHub
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 and GitHub
47c92e380c
Merge branch 'master' into throwing_disarm_stuff
2019-12-30 00:05:17 -08:00
kevinz000 and GitHub
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 and GitHub
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
KathrinBailey