r4d6
|
e8d43dac87
|
Port boops and handshakes
|
2019-12-16 06:27:18 -05:00 |
|
Useroth
|
8151a1f3ff
|
Merged master into this branch.
|
2019-12-16 12:06:30 +01:00 |
|
kevinz000
|
ba7a3f5fd2
|
Merge pull request #9971 from Xantholne/xantholne-christmas01
Adds the Christmas Clothes you never knew you wanted.
|
2019-12-15 20:11:09 -07:00 |
|
BlackMajor
|
74cc1ec547
|
Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
|
2019-12-16 14:14:35 +13:00 |
|
Unknown
|
ad88481f3e
|
OwO whats this notices your
|
2019-12-15 16:45:34 -07:00 |
|
Putnam3145
|
363380405e
|
Merge pull request #10198 from Ghommie/Ghommie-cit466
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-15 15:42:13 -08:00 |
|
Putnam3145
|
7aa454dbbb
|
Merge pull request #10197 from Ghommie/Ghommie-cit465
fixing double-flavour (and bland custom) ice creams.
|
2019-12-15 15:24:17 -08:00 |
|
Ghommie
|
22aba489e3
|
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-16 00:21:28 +01:00 |
|
Unknown
|
008c4ef822
|
according to all known laws of aviation
|
2019-12-15 16:18:42 -07:00 |
|
Unknown
|
9bfba1d1d9
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-15 16:14:37 -07:00 |
|
Ghommie
|
0a4a2acbab
|
fixing double-flavour ice creams.
|
2019-12-16 00:00:58 +01:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
Artur
|
58f4f58cd2
|
Slaughter demons shouldnt bleed
|
2019-12-16 00:05:51 +02:00 |
|
BlackMajor
|
4b177c4956
|
Adjusted NF balance
|
2019-12-16 01:20:14 +13:00 |
|
Putnam3145
|
2e9503f6d7
|
Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
|
2019-12-14 20:37:57 -08:00 |
|
Lin
|
cce63507d1
|
Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
|
2019-12-15 00:16:34 +00:00 |
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
Lin
|
49c37641a7
|
Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
|
2019-12-15 00:04:58 +00:00 |
|
Lin
|
1f852ea92a
|
Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
|
2019-12-15 00:02:57 +00:00 |
|
Putnam3145
|
bd1040ab60
|
Merge pull request #10171 from r4d6/patch-1
Who the fuck put 10 shielding when you need 9?
|
2019-12-14 11:04:37 -08:00 |
|
Artur
|
6124fbf316
|
Hopefully this fixes the linter errors
|
2019-12-14 19:04:36 +02:00 |
|
Artur
|
d0493ac471
|
Reviewer and linter fixes, and veil tweak
|
2019-12-14 17:09:39 +02:00 |
|
BlackMajor
|
59d0376985
|
finished
|
2019-12-14 17:31:26 +13:00 |
|
kevinz000
|
659b78d8b8
|
Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
|
2019-12-13 16:52:22 -07:00 |
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
r4d6
|
5f95e0d5a6
|
Remove an extra antimatter engine shielding
|
2019-12-13 08:17:06 -05:00 |
|
BlackMajor
|
2bf35ec81c
|
Nuclear fist
|
2019-12-14 02:15:09 +13:00 |
|
Ghommie
|
2611023488
|
Ports "Roundstart borg brains no longer decay."
|
2019-12-13 07:33:45 +01:00 |
|
nik707
|
cdeb4733aa
|
Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
|
2019-12-12 23:50:34 -06:00 |
|
Ghommie
|
79328012b0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402
|
2019-12-13 03:41:22 +01:00 |
|
BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
BlackMajor
|
725414bd03
|
Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
|
2019-12-13 10:20:33 +13:00 |
|
Putnam3145
|
71b2754aa6
|
Merge pull request #10121 from kappa-sama/patch-12
plasmafist wizard plasmafist wizard
|
2019-12-12 12:28:49 -08:00 |
|
Putnam3145
|
9234876ad1
|
Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
|
2019-12-12 09:30:34 -08:00 |
|
Ghommie
|
3545f10137
|
Fixing character setup preview icons.
|
2019-12-12 17:04:14 +01:00 |
|
Lin
|
a4d52454db
|
Merge pull request #10085 from Ghommie/Ghommie-cit440
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
|
2019-12-12 02:13:54 +00:00 |
|
kevinz000
|
ded283fa55
|
Update conveyor2.dm
|
2019-12-11 14:41:58 -07:00 |
|
Trilbyspaceclone
|
a7c8fb6470
|
corrects/adds a new dog fashion to telegram hat
|
2019-12-11 12:43:07 -05:00 |
|
Lin
|
9ec8458803
|
Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-12-10 23:52:31 +00:00 |
|
BlackMajor
|
8817f04e19
|
Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
|
2019-12-10 11:18:55 +13:00 |
|
Putnam3145
|
ee65d93e5a
|
Merge pull request #10086 from Ghommie/Ghommie-cit441
Fixes AI core display I may have broken with my coding extravaganza.
|
2019-12-09 13:41:25 -08:00 |
|
Putnam3145
|
5522b3d11d
|
Merge pull request #10037 from Ghommie/Ghommie-cit421
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
|
2019-12-09 13:34:23 -08:00 |
|
Putnam3145
|
c54523e324
|
Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87
can we not tell all the nonantags that antagonist ooc is enabled please
|
2019-12-09 13:25:37 -08:00 |
|
Putnam3145
|
975a40cadf
|
Merge pull request #10094 from Trilbyspaceclone/patch-242
Fixes eletroplating of brozne/golden tool box
|
2019-12-09 13:23:13 -08:00 |
|
Putnam3145
|
739f873ca6
|
Merge pull request #10132 from Trilbyspaceclone/patch-243
Makes meat hook fit in boh again
|
2019-12-09 13:08:12 -08:00 |
|
Putnam3145
|
beddaa1a99
|
Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
|
2019-12-09 12:40:37 -08:00 |
|
Trilbyspaceclone
|
7c4fab127f
|
Update necropolis_chests.dm
|
2019-12-09 15:37:22 -05:00 |
|
Putnam3145
|
01bb9d79d9
|
Merge pull request #10114 from r4d6/n2o-pressure-tank
Add a N2O Pressure Tank
|
2019-12-09 12:33:03 -08:00 |
|
Artur
|
488c0f1833
|
Mindshield fix and thrall buff
|
2019-12-09 19:08:42 +02:00 |
|
kappa-sama
|
f790d675d9
|
flavor text
|
2019-12-09 09:06:11 -05:00 |
|