Commit Graph
9518 Commits
Author SHA1 Message Date
deathride58andGitHub c6f879ee51 Merge pull request #4127 from Citadel-Station-13/upstream-merge-33073
[MIRROR] Implanted cultists can now be elected as master without being perma-deculted
2017-11-26 02:15:27 +00:00
CitadelStationBot 80b3a2001a Automatic changelog generation for PR #4126 [ci skip] 2017-11-25 20:14:58 -06:00
deathride58andGitHub ff77f397ff Merge pull request #4126 from Citadel-Station-13/upstream-merge-32992
[MIRROR] Fixes cryocells not properly disconnecting and reconnecting/switching piping directions after wrench rotation.
2017-11-26 02:14:56 +00:00
CitadelStationBot 1dfeb13b77 Automatic changelog generation for PR #4125 [ci skip] 2017-11-25 20:14:04 -06:00
deathride58andGitHub d660b6a2a8 Merge pull request #4125 from Citadel-Station-13/upstream-merge-33005
[MIRROR] Maybe fixes meson hearing exploit
2017-11-26 02:14:02 +00:00
CitadelStationBot 5c7f4661bd Automatic changelog generation for PR #4124 [ci skip] 2017-11-25 20:13:49 -06:00
deathride58andGitHub ec26cabd9d Merge pull request #4124 from Citadel-Station-13/upstream-merge-33069
[MIRROR] Lowers rack layer to 2.8
2017-11-26 02:13:46 +00:00
CitadelStationBot 718716590b Implanted cultists can now be elected as master without being perma-deculted 2017-11-25 15:17:42 -06:00
MoreRobustThanYouandCitadelStationBot 8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
CitadelStationBot c2919a38d0 Fixes cryocells not properly disconnecting and reconnecting/switching piping directions after wrench rotation. 2017-11-25 13:27:38 -06:00
kevinz000andCitadelStationBot 606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -06:00
CitadelStationBot 181bbd5778 Maybe fixes meson hearing exploit 2017-11-25 13:25:24 -06:00
vuonojenmustaturskaandCitadelStationBot 744a78e932 Maybe fixes meson hearing exploit (#33005)
* Not all of wisdom brings joy

* Serves me right for making changes based on how i remember the code working
2017-11-25 13:25:24 -06:00
CitadelStationBot 0c3c875434 Lowers rack layer to 2.8 2017-11-25 09:21:02 -06:00
WJohnandCitadelStationBot 237f0fa8db Lowers rack layer to 2.8 (#33069) 2017-11-25 09:21:02 -06:00
deathride58andGitHub 14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
deathride58andGitHub 5636f01831 Merge pull request #4122 from Citadel-Station-13/upstream-merge-33058
[MIRROR] pais can no longer buckle to objects, and buckle others to objects
2017-11-25 05:49:37 +00:00
CitadelStationBot 7db8a64ca1 Automatic changelog generation for PR #4121 [ci skip] 2017-11-24 23:49:25 -06:00
deathride58andGitHub 55089be2b5 Merge pull request #4121 from Citadel-Station-13/upstream-merge-33049
[MIRROR] fix zombie reanimation
2017-11-25 05:49:23 +00:00
deathride58andGitHub abc62818d3 Merge pull request #4120 from Citadel-Station-13/upstream-merge-33056
[MIRROR] robotics console desc change
2017-11-25 05:49:07 +00:00
deathride58andGitHub 6a49f6f939 Merge pull request #4118 from Citadel-Station-13/upstream-merge-33048
[MIRROR] Cleans up a double assignment
2017-11-25 05:48:50 +00:00
CitadelStationBot 89e807e644 Automatic changelog generation for PR #4117 [ci skip] 2017-11-24 23:36:25 -06:00
deathride58andGitHub 572d14fffd Merge pull request #4117 from Citadel-Station-13/upstream-merge-33015
[MIRROR] Deny buckling when the user is inside lockers, mechs, etc.
2017-11-25 05:36:22 +00:00
CitadelStationBot a809b50d27 pais can no longer buckle to objects, and buckle others to objects 2017-11-24 22:39:44 -06:00
ArmhulenandCitadelStationBot ceee0c80e7 okay (#33058) 2017-11-24 22:39:44 -06:00
CitadelStationBot 0f3bfb23ec fix zombie reanimation 2017-11-24 22:36:30 -06:00
checkraisefoldandCitadelStationBot c6a68bad83 fix zombie reanimation (#33049)
lol
2017-11-24 22:36:30 -06:00
CitadelStationBot 531b8603ba robotics console desc change 2017-11-24 22:36:22 -06:00
ArmhulenandCitadelStationBot d9c650970c making prs isn't even worth it anymore (#33056) 2017-11-24 22:36:22 -06:00
CitadelStationBot 8d43210673 Cleans up a double assignment 2017-11-24 22:29:53 -06:00
Y0SH1M4S73RandCitadelStationBot 86fca33d06 Cleans up a double assignment (#33048)
* Fixes component runtimes (#33045)

* fixes an internally redundant assignment statement
2017-11-24 22:29:53 -06:00
CitadelStationBot ddfb4c135d Deny buckling when the user is inside lockers, mechs, etc. 2017-11-24 22:29:40 -06:00
Tad HardestyandCitadelStationBot d52d546463 Deny buckling when the user is inside lockers, mechs, etc. (#33015) 2017-11-24 22:29:40 -06:00
deathride58andGitHub cf053af319 Update pandemic.dm 2017-11-24 18:50:23 -05:00
deathride58andGitHub ff94b3e1e1 Merge pull request #4113 from Citadel-Station-13/upstream-merge-32998
[MIRROR] Revises the_station_areas list
2017-11-24 23:47:34 +00:00
deathride58andGitHub f92bc0c938 Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805
[MIRROR] Refactor on_reagent_change to pass through the change type
2017-11-24 23:47:13 +00:00
deathride58andGitHub 837779b683 Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
CitadelStationBot 38a7229bdd Automatic changelog generation for PR #4110 [ci skip] 2017-11-24 17:14:34 -06:00
deathride58andGitHub 2cb4ce3cc5 Merge pull request #4110 from Citadel-Station-13/upstream-merge-32891
[MIRROR] Re-enables bolas in crafting
2017-11-24 23:14:32 +00:00
deathride58andGitHub ed9b99a166 Merge pull request #4108 from Citadel-Station-13/upstream-merge-33026
[MIRROR] Fixed mobs getting rotated by shuttles even if they are not moved
2017-11-24 23:14:14 +00:00
CitadelStationBot a93c69614f Automatic changelog generation for PR #4105 [ci skip] 2017-11-24 17:13:30 -06:00
deathride58andGitHub 9b52d847a7 Merge pull request #4105 from Citadel-Station-13/upstream-merge-33024
[MIRROR] Makes reverse pulling only apply to dense objects
2017-11-24 23:13:28 +00:00
deathride58andGitHub 7125a50340 Merge pull request #4104 from Citadel-Station-13/upstream-merge-33006
[MIRROR] Adds a config to optionally hard reboot DD
2017-11-24 23:12:45 +00:00
deathride58andGitHub 72bc951aa2 Merge pull request #4103 from Citadel-Station-13/upstream-merge-33004
[MIRROR] If a client mob ends up in nullspace with no admins on a message is sent to chat
2017-11-24 23:11:58 +00:00
deathride58andGitHub d5756e11d6 Merge pull request #4107 from Citadel-Station-13/upstream-merge-33009
[MIRROR] Rename LICENSE-GPLv3.txt to OLD_LICENSE-GPLv3.txt
2017-11-24 23:03:17 +00:00
deathride58andGitHub 754490a2d3 Update pandemic.dm 2017-11-24 18:02:51 -05:00
CitadelStationBot 54947e9f8a Automatic changelog generation for PR #4099 [ci skip] 2017-11-24 17:01:38 -06:00
deathride58andGitHub 5ee634aa31 Merge pull request #4099 from Citadel-Station-13/upstream-merge-32626
[MIRROR] Custom docker improvements
2017-11-24 23:01:35 +00:00
deathride58andGitHub 44fb7ccdb7 Update drinkingglass.dm 2017-11-24 18:00:44 -05:00
CitadelStationBot ac3e4a800b Automatic changelog generation for PR #4100 [ci skip] 2017-11-24 17:00:07 -06:00