Commit Graph

12142 Commits

Author SHA1 Message Date
Ghommie
67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Seris02
90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08: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
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Ghommie
9ee70c7931 Travis is just faster at compiling, I can work on other things meanwhile 2020-01-24 02:34:32 +01:00
Ghommie
78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie
ba2c149d4d Improvements. 2020-01-24 02:22:32 +01:00
Ghommie
6b62aef86c Missing ! 2020-01-24 02:19:52 +01:00
Ghommie
524f665f4a fix for hypospray jank. 2020-01-24 02:17:41 +01:00
Ghommie
05150e821e A few consistencies for those "shoes" that don't actually cover feet. 2020-01-24 01:25:23 +01:00
Ghommie
8e5f221bb9 Ports "Makes falsewall hide pipes and wires" 2020-01-24 00:57:27 +01:00
Ghommie
c8bf148216 snowflake-friendly towels. 2020-01-24 00:06:07 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05: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
Ghommie
292aaa58dc Fixes dead malf AI doomsday, a few ported updates. 2020-01-23 17:36:23 +01:00
Kraseo
14b7711590 i will end whoever ported virgo hairs and thought it was fine to do it like that 2020-01-23 17:29:21 +01: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
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
Unknown
bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07: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
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
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
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
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
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
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
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
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
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
Arturlang
0a545da35d Webedit galore 2020-01-22 18:12:26 +01:00
Arturlang
e025c8a743 Oh right its a typo 2020-01-22 18:11:37 +01:00
Trilbyspaceclone
ebb6ac1d7b more words 2020-01-22 11:33:39 -05:00
Poojawa
ace1950800 Makes listen checks a tad cheaper.
Improves external sounds with falloff
2020-01-22 00:07:39 -06:00
Poojawa
a665aeb50f ok just skip this line I guess 2020-01-21 23:33:11 -06:00
Poojawa
9415ea095d Fixes blindness on transfers 2020-01-21 23:32:32 -06: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
Trilbyspaceclone
181984f478 Update materials.dm 2020-01-21 09:31:38 -05:00
kevinz000
ed5172f9ca changes 2020-01-20 23:17:58 -07:00