Commit Graph

28829 Commits

Author SHA1 Message Date
kevinz000 a5ddd4efa9 Update hilbertshotel.dm 2020-01-24 00:01:02 -07:00
kevinz000 99d6d589ac Update hilbertshotel.dm 2020-01-23 19:07:39 -07:00
kevinz000 65871ca1d3 Update hilbertshotel.dm 2020-01-23 19:07:17 -07:00
kevinz000 5ce80078ab Update hilbertshotel.dm 2020-01-23 19:03:26 -07: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
CitadelStationBot 5a4c28ba96 Automatic changelog generation for PR #10410 [ci skip] 2020-01-22 20:06:54 -06:00
Ghom bf62563507 Merge pull request #10410 from CameronWoof/free-the-lizard
Humans and anthromorphs can now use lizard tails.
2020-01-23 03:06:52 +01:00
CitadelStationBot ea04242a09 Automatic changelog generation for PR #10645 [ci skip] 2020-01-22 19:53:38 -06:00
Ghom 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
2020-01-23 02:53:34 +01:00
Ghom 3ce27d6c36 Merge pull request #10638 from Hatterhat/patch-3
compact defibs have a properly set departmental flag now
2020-01-23 02:51:17 +01:00
CitadelStationBot 20604fd5b3 Automatic changelog generation for PR #10450 [ci skip] 2020-01-22 19:44:20 -06:00
Ghom 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8
(is this really a good idea) hitscan emitters
2020-01-23 02:44:17 +01:00
CitadelStationBot 78875eb80d Automatic changelog generation for PR #10622 [ci skip] 2020-01-22 19:41:21 -06:00
Ghom 4435bd4d56 Merge pull request #10622 from Owai-Seek/mojodojo
Ghost Cafe Cleanup
2020-01-23 02:41:18 +01:00
CitadelStationBot bcf579a44d Automatic changelog generation for PR #10606 [ci skip] 2020-01-22 19:40:56 -06:00
Ghom fcbc5149c4 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
r4d6 c78944c5bc Update 2020-01-22 13:47:57 -05:00
r4d6 869e31b27b Removing useless code 2020-01-22 13:17:47 -05:00
r4d6 96c0a86b5f Make the Radiation Hardsuit a Voidsuit instead 2020-01-22 13:17:29 -05:00
Trilbyspaceclone ebb6ac1d7b more words 2020-01-22 11:33:39 -05:00
r4d6 e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
Trilbyspaceclone bc1500c04c Update cleanbot.dm 2020-01-21 18:33:04 -05:00
Chayse Ramsay 5e5d80238b Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.
2020-01-21 22:29:15 +00:00
CitadelStationBot 86c5d43a1b Automatic changelog generation for PR #10640 [ci skip] 2020-01-21 09:23:42 -06:00
Ghom 0985d1f1d0 Merge pull request #10640 from r4d6/mapfix
Map Fixes
2020-01-21 16:23:39 +01:00
r4d6 1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
kevinz000 ed5172f9ca changes 2020-01-20 23:17:58 -07:00