 Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
|
CitadelStationBot
|
e39f9732e0
|
Automatic changelog generation for PR #10246 [ci skip]
|
2019-12-22 20:25:29 -06:00 |
|
|
Ghom
|
db2a108b4a
|
Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
|
2019-12-23 03:25:27 +01:00 |
|
|
CitadelStationBot
|
dfc4656a6e
|
Automatic changelog generation for PR #10210 [ci skip]
|
2019-12-22 20:13:33 -06:00 |
|
|
Ghom
|
3635525c56
|
Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127
Cargo shuttle now silently leaves behind slaughter demons + revenants
|
2019-12-23 03:13:31 +01:00 |
|
|
CitadelStationBot
|
7c0c4cc7cd
|
Automatic changelog generation for PR #10093 [ci skip]
|
2019-12-22 19:31:53 -06:00 |
|
|
Ghom
|
f3936f2c81
|
Merge pull request #10093 from Trilbyspaceclone/donut
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
|
2019-12-23 02:31:50 +01:00 |
|
|
kevinz000
|
fcfdf5e253
|
Merge pull request #10240 from Ghommie/Ghommie-cit481
Converts the main timsorts file from relative pathing to absolute pathing.
|
2019-12-22 14:04:53 -08:00 |
|
|
CitadelStationBot
|
6eb62bb582
|
Automatic changelog generation for PR #10254 [ci skip]
|
2019-12-22 16:03:04 -06:00 |
|
|
kevinz000
|
6157cb0042
|
Merge pull request #10254 from r4d6/patch-1
Fix the nose boop
|
2019-12-22 14:03:02 -08:00 |
|
|
TrilbySpaceClone
|
784ea3f5e1
|
readds sprites
|
2019-12-22 03:06:04 -05:00 |
|
|
kevinz000
|
f39d12527d
|
Update supply.dm
|
2019-12-21 23:50:59 -08:00 |
|
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
|
CitadelStationBot
|
c87bdef944
|
Automatic changelog generation for PR #10263 [ci skip]
|
2019-12-21 21:54:44 -06:00 |
|
|
Putnam3145
|
cad1bd2161
|
Merge pull request #10263 from Trilbyspaceclone/patch-247
Makes Buzz Fuzz less coma'enducing
|
2019-12-21 19:54:42 -08:00 |
|
|
Trilbyspaceclone
|
f5a55aaecf
|
Nerfs fun
|
2019-12-21 21:09:22 -05:00 |
|
|
Lin
|
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
|
86074ae6b1
|
lowered to 10 after i struggled to open tickets panel
|
2019-12-21 14:33:02 -08:00 |
|
|
CitadelStationBot
|
fac4c01d10
|
Automatic changelog generation for PR #9830 [ci skip]
|
2019-12-21 12:02:03 -06:00 |
|
|
Ghom
|
6b2fe333f4
|
Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture
Stun warfare rebalance - CBT edition
|
2019-12-21 19:02:00 +01:00 |
|
|
CitadelStationBot
|
c5f7046d36
|
Automatic changelog generation for PR #10190 [ci skip]
|
2019-12-21 11:34:37 -06:00 |
|
|
Ghom
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
|
CitadelStationBot
|
a12b2c9954
|
Automatic changelog generation for PR #9950 [ci skip]
|
2019-12-21 10:26:07 -06:00 |
|
|
Ghom
|
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 |
|
|
CitadelStationBot
|
a30a13639a
|
Automatic changelog generation for PR #10096 [ci skip]
|
2019-12-21 09:48:58 -06:00 |
|
|
Ghom
|
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
|
2a76743747
|
I'm playing dirty because we have too many PRs to merge anyway.
|
2019-12-21 16:42:27 +01:00 |
|
|
Ghom
|
5c3d3f4cc5
|
Is merging someone else's PR you personally fixed considerable as self-merging?
|
2019-12-21 16:40:32 +01:00 |
|
|
Ghom
|
daf099388e
|
Unnecessary OOC note.
|
2019-12-21 16:37:28 +01:00 |
|
|
Ghom
|
4624a1739a
|
typo
|
2019-12-21 16:30:02 +01:00 |
|
|
CitadelStationBot
|
bb99be2504
|
Automatic changelog generation for PR #10257 [ci skip]
|
2019-12-21 08:33:30 -06:00 |
|
|
Ghom
|
9d00072072
|
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
Removes a magicnumber
|
2019-12-21 15:33:27 +01:00 |
|
|
CitadelStationBot
|
7396d19e69
|
Automatic changelog generation for PR #10120 [ci skip]
|
2019-12-21 08:30:35 -06:00 |
|
|
Ghom
|
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 |
|
|
CitadelStationBot
|
6d41bfdab1
|
Automatic changelog generation for PR #10164 [ci skip]
|
2019-12-21 08:24:08 -06:00 |
|
|
Ghom
|
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 |
|
|
Ghom
|
06cbb381d3
|
Better safe than sorry.
|
2019-12-21 15:17:29 +01:00 |
|
|
DeltaFire
|
3738156340
|
Magic number baaad
|
2019-12-21 15:16:28 +01:00 |
|
|
Ghom
|
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
|
7f0ae5dbde
|
I gotta go fast.
|
2019-12-21 13:04:27 +01:00 |
|
|
Ghom
|
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
|
4cd4a795ea
|
Begone crap.
|
2019-12-21 12:20:02 +01:00 |
|
|
CitadelStationBot
|
1d5c37e3cc
|
Automatic changelog generation for PR #10141 [ci skip]
|
2019-12-21 04:45:47 -06:00 |
|
|
Ghom
|
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 |
|
|
CitadelStationBot
|
7bc583e27e
|
Automatic changelog generation for PR #10232 [ci skip]
|
2019-12-21 04:27:06 -06:00 |
|
|
Ghom
|
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 |
|
|
CitadelStationBot
|
c5a1774bdf
|
Automatic changelog generation for PR #9940 [ci skip]
|
2019-12-21 04:20:27 -06:00 |
|
|
Ghom
|
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 |
|
|
CitadelStationBot
|
301aa72f4a
|
Automatic changelog generation for PR #9596 [ci skip]
|
2019-12-21 04:15:32 -06:00 |
|
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|