7c1bd7f8a7
how one = can make a difference
2019-12-21 11:34:41 -08:00
6b2fe333f4
Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture
...
Stun warfare rebalance - CBT edition
2019-12-21 19:02:00 +01:00
a33065a728
Merge pull request #10190 from Trilbyspaceclone/honeysoda
...
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
e38396e984
Made vote not fire every tick, added "force" option that pops as soon as vote starts
2019-12-21 08:59:48 -08:00
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
32ec9d6f50
i believe they call this a "weh"
2019-12-21 08:36:00 -08:00
d575b20e77
Added statbus support
2019-12-21 08:34:16 -08:00
128b857d99
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
2019-12-21 08:31:44 -08:00
2b2a3c2721
Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1
...
Nerfs the Clockwork Marauder meta
2019-12-21 17:26:04 +01:00
2bc401e2d2
Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
...
nanites can no longer spread through atmospherics-blocking objects
2019-12-21 16:48:56 +01:00
2a76743747
I'm playing dirty because we have too many PRs to merge anyway.
2019-12-21 16:42:27 +01:00
5c3d3f4cc5
Is merging someone else's PR you personally fixed considerable as self-merging?
2019-12-21 16:40:32 +01:00
daf099388e
Unnecessary OOC note.
2019-12-21 16:37:28 +01:00
4624a1739a
typo
2019-12-21 16:30:02 +01:00
9d00072072
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
...
Removes a magicnumber
2019-12-21 15:33:27 +01:00
aea2b8865e
Merge pull request #10120 from Citadel-Station-13/night_vision
...
Night vision trait but it just boosts barely-lit visibility
2019-12-21 15:30:32 +01:00
a384b1782b
Merge pull request #10164 from kappa-sama/martialartist
...
What ho, Muscle Wizard! Might you cast us a spell?
2019-12-21 15:24:06 +01:00
3920e6a38d
Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis
2019-12-21 22:22:12 +08:00
06cbb381d3
Better safe than sorry.
2019-12-21 15:17:29 +01:00
c5aef98252
Make things even more organized
2019-12-21 09:17:15 -05:00
3738156340
Magic number baaad
2019-12-21 15:16:28 +01:00
fb078e18f9
QoL Update
...
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
2019-12-21 09:12:04 -05:00
0b2568a9cf
Modernizes Polychromic Uniform Code
...
No more modular_citadel, but the neck polychrome crap needs more work in another PR
2019-12-21 21:38:04 +08:00
ce34bcf2e4
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
...
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
2019-12-21 14:34:43 +01:00
7f0ae5dbde
I gotta go fast.
2019-12-21 13:04:27 +01:00
f30be0ace6
Merge pull request #10077 from ForrestWick/uplinkchanges
...
Moves brainwash surgery from role restricted to devices and tools in the uplink
2019-12-21 12:43:18 +01:00
3df8619980
Merge pull request #10141 from Putnam3145/dynamic-statbus
...
Adds a bunch of statbus logging to dynamic
2019-12-21 11:45:44 +01:00
71d0c3e257
Merge pull request #10232 from DeltaFire15/cc-headmessages
...
All heads of staff can now spam CC.
2019-12-21 11:27:04 +01:00
848ad4b39b
Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul
...
Dynamic rulesets that have fired in recent rounds have lower weight
2019-12-21 11:20:24 +01:00
19fc981cc1
Merge pull request #9596 from Linzolle/abductor-update
...
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
a7cda1aea0
Merge pull request #10059 from lolman360/HeadCorgi
...
you can pick up corgis now
2019-12-21 11:05:36 +01:00
b490873f2a
ff
2019-12-21 13:13:37 +11:00
4c7cc3615e
ff
2019-12-21 12:48:09 +11:00
3043a4f8c9
ghom help
2019-12-21 12:47:36 +11:00
7048e4e5ab
hhh
2019-12-21 12:43:48 +11:00
b02ffa2e2d
Update inhand_holder.dm
2019-12-21 12:40:41 +11:00
efdded7e48
Remove extra indentations
2019-12-20 18:38:47 -05:00
bc70bc3882
Fix the nose boop.
2019-12-20 18:10:02 -05:00
ef360838da
errors
2019-12-20 14:50:08 -08:00
c810145fc1
also adds aphrodisiacs, slaps, all hypno as prefs
2019-12-20 14:47:09 -08:00
a398b7c413
Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125
...
Adds 8 character save slots
2019-12-20 22:55:22 +01:00
9a38612ec4
Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128
...
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
2019-12-20 16:27:47 +01:00
685425ed55
Atomises out the magicnumber change
2019-12-20 15:26:16 +01:00
4016835b0a
Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114
...
Radiation storms no longer do random mutations in of itself, but are far more lethal
2019-12-20 14:32:42 +01:00
b581f97fba
Merge pull request #9563 from Thalpy/Superbases-goodbye
...
[TESTMERGE] Goodbye, superpH, you were too wild for our world.
2019-12-20 14:28:21 +01:00
d33feb6c35
Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116
...
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
2019-12-20 14:26:50 +01:00
f56684a473
Merge pull request #9925 from Linzolle/cosmic-brain
...
change cosmic coat crafting recipe
2019-12-20 14:26:24 +01:00
6d824c99cf
Merge pull request #10051 from kappa-sama/patch-9
...
puts our legion more up to date with tg's
2019-12-20 14:25:09 +01:00
d52a469933
Merge pull request #10142 from Trilbyspaceclone/patch-244
...
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
2019-12-20 13:36:02 +01:00
e526f26f46
Merge pull request #10126 from Putnam3145/he-tweaks
...
Makes HE pipes realistically radiate away heat
2019-12-20 13:34:47 +01:00
Putnam