Commit Graph

22949 Commits

Author SHA1 Message Date
Fermi 34cfd2c1e3 Fix for #9091 2019-08-09 12:12:25 +01:00
Fermi 1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
Fermi 9d3aa1f3b0 Removing a comment block I missed. 2019-08-08 18:28:47 +01:00
Fermi 004b79d4cd Vodka is alkaline 2019-08-08 15:31:07 +01:00
Fermi 99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00
Fermi b4208860d8 Spelling and a few more logs. 2019-08-07 17:45:40 +01:00
Fermi 10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Fermi a8e2311caf Bloomin' indents! 2019-08-07 14:53:20 +01:00
Fermi 7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi 80fe0274aa Updated ToriSprites. 2019-08-07 09:49:00 +01:00
Fermi 2a049e3485 Should fix the locker conflict! (untested) 2019-08-07 09:40:13 +01:00
Thalpy 2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
CitadelStationBot 8c346af693 Automatic changelog generation for PR #9022 [ci skip] 2019-08-07 02:51:21 -05:00
kevinz000 2959a87892 Merge pull request #9022 from Ghommie/Ghommie-cit175
Ports "More robust dorfs."
2019-08-07 00:51:19 -07:00
CitadelStationBot b0f1e47af1 Automatic changelog generation for PR #8986 [ci skip] 2019-08-07 02:49:25 -05:00
kevinz000 a845b5ae0c Merge pull request #8986 from Ghommie/Ghommie-cit163
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
2019-08-07 00:49:23 -07:00
kevinz000 6db8d9aef4 Merge pull request #9017 from Trilbyspaceclone/patch-205
Ports "Some stealth box changes #45332" Aka nerfing Stealth boxes
2019-08-07 00:48:12 -07:00
CitadelStationBot 4fc7089189 Automatic changelog generation for PR #8673 [ci skip] 2019-08-07 02:45:37 -05:00
kevinz000 27667d467b Merge pull request #8673 from Trilbyspaceclone/patch-179
Makes upgraded prostics worth getting - Re-balances robotic lims
2019-08-07 00:45:34 -07:00
kevinz000 f2c92a1bcd Merge pull request #9060 from Sishen1542/lockerfix
quick fix for locker lock removal text
2019-08-07 00:29:49 -07:00
Fermi ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Fermi f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy 53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00
BlackMajor 98cecb2cc7 Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53
Removes damage from *dab
2019-08-06 21:47:52 +12:00
BlackMajor 030b5f6bca Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66
[SPEEDMERGE] I BROKE SUBTLER
2019-08-06 21:45:45 +12:00
CitadelStationBot db13295b96 Automatic changelog generation for PR #9050 [ci skip] 2019-08-06 04:28:31 -05:00
BlackMajor d8d6fda259 Merge pull request #9050 from Ghommie/Ghommie-cit179
Fixes combatmode pushing not knocking people down against walls.
2019-08-06 21:28:29 +12:00
Sishen decbd37ced Update closets.dm 2019-08-06 03:49:08 -04:00
kevinz000 d1548c7907 Merge pull request #9058 from Ghommie/Ghommie-cit180
Defaults the teleportation forceMove arg to TRUE.
2019-08-05 15:39:39 -07:00
CitadelStationBot 17ac027fdc Automatic changelog generation for PR #9045 [ci skip] 2019-08-05 16:57:57 -05:00
kevinz000 eab07c62de Merge pull request #9045 from CameronWoof/codifying-mrp-again
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
2019-08-05 14:57:54 -07:00
Ghommie 8978f0ecf9 Defaults the teleportation forceMove arg to TRUE. 2019-08-05 18:19:48 +02:00
CameronWoof d09fa0d8a0 fix for smoke and odysseus exploits 2019-08-05 07:48:27 -07:00
Cameron! 33d883367a makes fluid_rate match the intended rate 2019-08-05 06:41:57 -07:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
CitadelStationBot 96dd255fe0 Automatic changelog generation for PR #8900 [ci skip] 2019-08-05 02:55:43 -05:00
kevinz000 aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
CitadelStationBot 8ee6574ba1 Automatic changelog generation for PR #8908 [ci skip] 2019-08-05 02:54:45 -05:00
kevinz000 9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
CitadelStationBot 6ebd4ace7d Automatic changelog generation for PR #9046 [ci skip] 2019-08-05 02:50:06 -05:00
kevinz000 ed30f9ba58 Merge pull request #9046 from Sishen1542/satdeleite
meteor sats are no longer dense objects
2019-08-05 00:50:04 -07:00
kevinz000 b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
CitadelStationBot b8ce7ec463 Automatic changelog generation for PR #9021 [ci skip] 2019-08-05 02:49:31 -05:00
kevinz000 4f0dc33d1b Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-08-05 00:49:29 -07:00
CitadelStationBot 995149639a Automatic changelog generation for PR #8998 [ci skip] 2019-08-05 02:49:16 -05:00
kevinz000 f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167
Fixes inactive high luminosity eyes turning back on as soon as you move around.
2019-08-05 00:49:14 -07:00
CitadelStationBot 56960b46d2 Automatic changelog generation for PR #8660 [ci skip] 2019-08-05 02:47:35 -05:00
kevinz000 cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
2019-08-05 00:47:28 -07:00
CitadelStationBot ca09933379 Automatic changelog generation for PR #8774 [ci skip] 2019-08-05 02:47:06 -05:00
kevinz000 a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult
Removes the human check from cap/chap mind on cult conversion.
2019-08-05 00:47:04 -07:00