Commit Graph

27249 Commits

Author SHA1 Message Date
shellspeed1
f43eb2bc48 reattaches missing antenna 2019-12-22 00:26:37 -08:00
shellspeed1
7e4d1da2d8 Fixes mistake in less commit. 2019-12-22 00:22:24 -08:00
shellspeed1
5ef47b8323 I swear I had this in here orginally. 2019-12-22 00:13:50 -08:00
shellspeed1
ad07ce5293 another one 2019-12-22 00:09:58 -08:00
shellspeed1
f7cc4d9578 Forgot a sprite 2019-12-22 00:08:32 -08:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08: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
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
CitadelStationBot
85fca5c560 Automatic changelog generation for PR #10059 [ci skip] 2019-12-21 04:05:39 -06:00
Ghom
a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +01:00
CitadelStationBot
01def96b3d Automatic changelog generation for PR #10058 [ci skip] 2019-12-21 00:20:52 -06:00
kevinz000
97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
2019-12-20 23:20:49 -07:00
lolman360
b490873f2a ff 2019-12-21 13:13:37 +11:00
lolman360
4c7cc3615e ff 2019-12-21 12:48:09 +11:00
lolman360
3043a4f8c9 ghom help 2019-12-21 12:47:36 +11:00
lolman360
7048e4e5ab hhh 2019-12-21 12:43:48 +11:00
lolman360
b02ffa2e2d Update inhand_holder.dm 2019-12-21 12:40:41 +11:00
CitadelStationBot
353564811c Automatic changelog generation for PR #10200 [ci skip] 2019-12-20 15:55:25 -06:00
Ghom
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