Ghommie
757af250cf
Fix goose meat.
2019-12-22 12:21:11 +01:00
Ghommie
4fbd9fdca0
Effectively removes the long unrequired roboticist encryption key.
2019-12-22 12:02:15 +01:00
Ghommie
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
kevinz000 and GitHub
f39d12527d
Update supply.dm
2019-12-21 23:50:59 -08:00
shellspeed1
1875ea3f58
new wings and fluff
2019-12-21 23:47:41 -08:00
TrilbySpaceClone
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
Seris02
d6727bce64
woops
2019-12-22 12:26:42 +08:00
Seris02
18481ec253
more coat stuff yes yes
2019-12-22 12:19:58 +08:00
Trilbyspaceclone and GitHub
f5a55aaecf
Nerfs fun
2019-12-21 21:09:22 -05:00
Lin and GitHub
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
kevinz000 and GitHub
86074ae6b1
lowered to 10 after i struggled to open tickets panel
2019-12-21 14:33:02 -08:00
Ghom and GitHub
31ba9fe4a8
Revert "Makes HE pipes realistically radiate away heat"
2019-12-21 22:43:26 +01:00
r4d6
84d99c8fe8
Fix indentation
2019-12-21 15:00:53 -05:00
r4d6
383e09651f
Suggestions
2019-12-21 14:55:37 -05:00
Ghom and GitHub
6b2fe333f4
Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture
...
Stun warfare rebalance - CBT edition
2019-12-21 19:02:00 +01:00
Ghom and GitHub
a33065a728
Merge pull request #10190 from Trilbyspaceclone/honeysoda
...
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
Ghommie
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
Ghom and GitHub
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
Ghom and GitHub
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
Ghom and GitHub
2a76743747
I'm playing dirty because we have too many PRs to merge anyway.
2019-12-21 16:42:27 +01:00
Ghom and GitHub
5c3d3f4cc5
Is merging someone else's PR you personally fixed considerable as self-merging?
2019-12-21 16:40:32 +01:00
Ghom and GitHub
daf099388e
Unnecessary OOC note.
2019-12-21 16:37:28 +01:00
Ghom and GitHub
4624a1739a
typo
2019-12-21 16:30:02 +01:00
Ghom and GitHub
9d00072072
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
...
Removes a magicnumber
2019-12-21 15:33:27 +01:00
Ghom and GitHub
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
Ghom and GitHub
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
Michiyamenotehifunana
3920e6a38d
Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis
2019-12-21 22:22:12 +08:00
Ghom and GitHub
06cbb381d3
Better safe than sorry.
2019-12-21 15:17:29 +01:00
r4d6
c5aef98252
Make things even more organized
2019-12-21 09:17:15 -05:00
DeltaFire
3738156340
Magic number baaad
2019-12-21 15:16:28 +01:00
r4d6
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
Michiyamenotehifunana
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
Ghom and GitHub
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
Ghom and GitHub
7f0ae5dbde
I gotta go fast.
2019-12-21 13:04:27 +01:00
Ghom and GitHub
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
Ghom and GitHub
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
Ghom and GitHub
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
Ghom and GitHub
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
Ghom and GitHub
19fc981cc1
Merge pull request #9596 from Linzolle/abductor-update
...
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
Ghom and GitHub
a7cda1aea0
Merge pull request #10059 from lolman360/HeadCorgi
...
you can pick up corgis now
2019-12-21 11:05:36 +01:00
lolman360 and GitHub
b490873f2a
ff
2019-12-21 13:13:37 +11:00
lolman360 and GitHub
4c7cc3615e
ff
2019-12-21 12:48:09 +11:00
lolman360 and GitHub
3043a4f8c9
ghom help
2019-12-21 12:47:36 +11:00
lolman360 and GitHub
7048e4e5ab
hhh
2019-12-21 12:43:48 +11:00
lolman360 and GitHub
b02ffa2e2d
Update inhand_holder.dm
2019-12-21 12:40:41 +11:00
r4d6 and GitHub
efdded7e48
Remove extra indentations
2019-12-20 18:38:47 -05:00
r4d6 and GitHub
bc70bc3882
Fix the nose boop.
2019-12-20 18:10:02 -05:00
Putnam
ef360838da
errors
2019-12-20 14:50:08 -08:00
Putnam
c810145fc1
also adds aphrodisiacs, slaps, all hypno as prefs
2019-12-20 14:47:09 -08:00
Ghom and GitHub
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
Ghommie