 r4d6
|
d5c09f11bc
|
Fix
|
2020-01-25 17:23:00 -05:00 |
|
|
CitadelStationBot
|
763f2ad521
|
Automatic changelog generation for PR #10650 [ci skip]
|
2020-01-24 01:33:00 -06:00 |
|
|
kevinz000
|
f626322fbd
|
Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
|
2020-01-24 00:32:57 -07:00 |
|
|
CitadelStationBot
|
9cbe0b5bc1
|
Automatic changelog generation for PR #10628 [ci skip]
|
2020-01-24 01:26:25 -06:00 |
|
|
kevinz000
|
928a8ceea3
|
Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
Quick rubber toolbox materials fix.
|
2020-01-24 00:26:22 -07:00 |
|
|
CitadelStationBot
|
8030a9f861
|
Automatic changelog generation for PR #10073 [ci skip]
|
2020-01-24 01:25:56 -06:00 |
|
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
|
CitadelStationBot
|
fb007069d1
|
Automatic changelog generation for PR #10609 [ci skip]
|
2020-01-24 01:22:11 -06:00 |
|
|
kevinz000
|
f8ec01676a
|
Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
|
2020-01-24 00:22:08 -07:00 |
|
|
CitadelStationBot
|
b87d0af224
|
Automatic changelog generation for PR #10526 [ci skip]
|
2020-01-24 01:21:37 -06:00 |
|
|
kevinz000
|
7cd6490e86
|
Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
|
2020-01-24 00:21:34 -07:00 |
|
|
kevinz000
|
07277436ac
|
Merge pull request #10665 from Ghommie/Ghommie-cit513
Fixes chainsaw force being set to 0 on drop.
|
2020-01-24 00:20:26 -07:00 |
|
|
CitadelStationBot
|
2c0eb94bcc
|
Automatic changelog generation for PR #10632 [ci skip]
|
2020-01-24 01:18:44 -06:00 |
|
|
kevinz000
|
6ffdc1642b
|
Merge pull request #10632 from Commandersand/nerd
buffs some wiz spell cooldonws and changes some incantation phrases
|
2020-01-24 00:18:41 -07:00 |
|
|
CitadelStationBot
|
3836857149
|
Automatic changelog generation for PR #10667 [ci skip]
|
2020-01-24 01:18:20 -06:00 |
|
|
kevinz000
|
c26f1b757e
|
Merge pull request #10667 from Ghommie/Ghommie-cit514
no longer can you wave at unseen things, nor bystanders will be informed of what you are waving at if they can't see it themselves.
|
2020-01-24 00:18:18 -07:00 |
|
|
CitadelStationBot
|
74a4bde4b8
|
Automatic changelog generation for PR #10664 [ci skip]
|
2020-01-24 01:18:07 -06:00 |
|
|
kevinz000
|
2a706ceb05
|
Merge pull request #10664 from kappa-sama/patch-17
makes cursed dragnet take 5 seconds instead of 30 to break out of
|
2020-01-24 00:18:05 -07:00 |
|
|
loginsandylogout
|
a7a3a3a417
|
Update code/modules/spells/spell_types/lightning.dm
po
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-23 22:52:18 -06:00 |
|
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
|
Seris02
|
4fec6bcb7e
|
there
|
2020-01-24 10:26:38 +08:00 |
|
|
kevinz000
|
4888e1522a
|
Merge pull request #10685 from Ghommie/Ghommie-cit522
A handful of runtime fixes.
|
2020-01-23 18:51:08 -07:00 |
|
|
Ghommie
|
7d5725e450
|
a dot
|
2020-01-24 02:31:46 +01:00 |
|
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
|
Ghom
|
14a33ee7dc
|
Merge pull request #10651 from r4d6/Soft-rad-suit
Make the radiation hardsuit a voidsuit instead
|
2020-01-23 19:23:09 +01:00 |
|
|
CitadelStationBot
|
5f1511b51e
|
Automatic changelog generation for PR #10598 [ci skip]
|
2020-01-23 09:38:42 -06:00 |
|
|
Ghom
|
21867f60dd
|
Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
Made metabolic synthesis nanites stop if not fed
|
2020-01-23 16:38:39 +01:00 |
|
|
CitadelStationBot
|
9951f518e3
|
Automatic changelog generation for PR #10610 [ci skip]
|
2020-01-23 08:44:03 -06:00 |
|
|
Ghom
|
86a3a5dd4d
|
Merge pull request #10610 from Owai-Seek/bountytweaks
Some Bounty Tweaks
|
2020-01-23 15:44:00 +01:00 |
|
|
Ghom
|
f3b9b20e57
|
Merge pull request #10672 from BlackMajor/master
Fixes a donor sprite.
|
2020-01-23 15:30:29 +01:00 |
|
|
BlackMajor
|
77e7dff11b
|
Webedit PR man bad
|
2020-01-24 01:41:40 +13:00 |
|
|
Winter Flare
|
3d85499919
|
Requested Changes + Nerf
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
|
2020-01-23 07:20:22 -05:00 |
|
|
BlackMajor
|
5fb2e60ebf
|
Merge branch 'master' into master
|
2020-01-24 00:50:46 +13:00 |
|
|
CitadelStationBot
|
f6546e82f2
|
Automatic changelog generation for PR #10620 [ci skip]
|
2020-01-23 05:48:09 -06:00 |
|
|
kevinz000
|
83591f8883
|
Merge pull request #10620 from Hatterhat/patch-1
exo suit nerf - melee and bomb armor
|
2020-01-23 04:48:06 -07:00 |
|
|
CitadelStationBot
|
9a23325e9e
|
Automatic changelog generation for PR #10602 [ci skip]
|
2020-01-23 05:47:49 -06:00 |
|
|
kevinz000
|
4304a7dd42
|
Merge pull request #10602 from Ghommie/Ghommie-cit509
RPD ventcrawler escapism sanity check.
|
2020-01-23 04:47:46 -07:00 |
|
|
CitadelStationBot
|
707d14987b
|
Automatic changelog generation for PR #10603 [ci skip]
|
2020-01-23 05:47:20 -06:00 |
|
|
kevinz000
|
aa19c2a17b
|
Merge pull request #10603 from Ghommie/Ghommie-cit510
clockwork cuirass now compatible with snakes. The original author was too lazy.
|
2020-01-23 04:47:18 -07:00 |
|
|
kevinz000
|
1b7265d8c1
|
Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
|
2020-01-23 04:46:52 -07:00 |
|
|
BlackMajor
|
7733d3f98a
|
Update robot_modules.dm
|
2020-01-24 00:42:41 +13:00 |
|
|
CitadelStationBot
|
cafbdcf581
|
Automatic changelog generation for PR #10636 [ci skip]
|
2020-01-23 05:35:15 -06:00 |
|
|
kevinz000
|
88f625edfc
|
Merge pull request #10636 from Ghommie/Ghommie-cit512
Trilby's solar panels PR but improved.
|
2020-01-23 04:35:13 -07:00 |
|
|
CitadelStationBot
|
196466bca6
|
Automatic changelog generation for PR #10641 [ci skip]
|
2020-01-23 05:34:27 -06:00 |
|
|
kevinz000
|
a01d7260d8
|
Merge pull request #10641 from jakeramsay007/Calibers-101
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
|
2020-01-23 04:34:24 -07:00 |
|
|
CitadelStationBot
|
bfcd45662f
|
Automatic changelog generation for PR #10643 [ci skip]
|
2020-01-23 05:33:33 -06:00 |
|
|
kevinz000
|
483266ea07
|
Merge pull request #10643 from Trilbyspaceclone/patch-270
Makes cleanbat ash/lava proof
|
2020-01-23 04:33:30 -07:00 |
|
|
TrilbySpaceClone
|
86ea13afeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270
|
2020-01-22 23:00:54 -05:00 |
|
|
Ghommie
|
762064edc0
|
Uhh...
|
2020-01-23 04:43:24 +01:00 |
|
|
Ghommie
|
5a8c22fef2
|
eh..,
|
2020-01-23 04:30:52 +01:00 |
|