0b96e469dd
Oh shit.
2019-12-22 13:07:37 +01:00
9034980871
randomized recipes fallback fix.
2019-12-22 12:58:11 +01:00
757af250cf
Fix goose meat.
2019-12-22 12:21:11 +01:00
4fbd9fdca0
Effectively removes the long unrequired roboticist encryption key.
2019-12-22 12:02:15 +01:00
8bc277d38d
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
2019-12-22 11:40:25 +01:00
f39d12527d
Update supply.dm
2019-12-21 23:50:59 -08:00
1875ea3f58
new wings and fluff
2019-12-21 23:47:41 -08:00
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
1c2fe646a4
better stats
2019-12-21 20:52:03 -08:00
d6727bce64
woops
2019-12-22 12:26:42 +08:00
18481ec253
more coat stuff yes yes
2019-12-22 12:19:58 +08:00
33d182d49a
made it nag you a bit, added logging
2019-12-21 19:53:48 -08:00
f5a55aaecf
Nerfs fun
2019-12-21 21:09:22 -05:00
9dce30a3a5
fixes
2019-12-21 16:24:41 -08:00
37a0f0d7e6
Merge pull request #10241 from Ghommie/Ghommie-cit482
...
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
2019-12-21 22:44:09 +00:00
86074ae6b1
lowered to 10 after i struggled to open tickets panel
2019-12-21 14:33:02 -08:00
31ba9fe4a8
Revert "Makes HE pipes realistically radiate away heat"
2019-12-21 22:43:26 +01:00
ecc34b1de1
make vote last longer, too
2019-12-21 13:24:13 -08:00
d42ed1ca49
Added extended, deobfuscated, made "how many to vote" bigger
2019-12-21 12:52:35 -08:00
0b63e79098
Merge branch 'master' into glassware
2019-12-21 15:41:45 -05:00
84d99c8fe8
Fix indentation
2019-12-21 15:00:53 -05:00
383e09651f
Suggestions
2019-12-21 14:55:37 -05:00
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
8c5e506a17
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382
2019-12-21 18:22:58 +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
7bf504247b
should be mutually exclusive whoops
2019-12-21 08:21:15 -08: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
Ghommie