Commit Graph

9538 Commits

Author SHA1 Message Date
Mark9013100
fb4787fbd1 Oldstation edits/fixes (#33080) 2017-11-26 00:01:21 -06:00
deathride58
d3b3c54e70 Merge pull request #4119 from Citadel-Station-13/upstream-merge-33053
[MIRROR] Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game
2017-11-26 02:19:34 +00:00
CitadelStationBot
73bc0fa700 Automatic changelog generation for PR #4111 [ci skip] 2017-11-25 20:19:18 -06:00
deathride58
b6a51532ed Merge pull request #4111 from Citadel-Station-13/upstream-merge-32984
[MIRROR] Fixes thermite burning lava
2017-11-26 02:19:15 +00:00
CitadelStationBot
87fca99454 Automatic changelog generation for PR #4116 [ci skip] 2017-11-25 20:18:59 -06:00
deathride58
be89f4d7dd Merge pull request #4116 from Citadel-Station-13/upstream-merge-32940
[MIRROR] Advanced Laserpointer Feline Interaction
2017-11-26 02:18:56 +00:00
deathride58
b32f24113a Merge pull request #4131 from Citadel-Station-13/upstream-merge-33075
[MIRROR] Adds spawn override system
2017-11-26 02:18:24 +00:00
CitadelStationBot
dcf2e91e1a Automatic changelog generation for PR #4129 [ci skip] 2017-11-25 20:16:05 -06:00
deathride58
5368aed6d5 Merge pull request #4129 from Citadel-Station-13/upstream-merge-33002
[MIRROR] Butterdogs
2017-11-26 02:16:03 +00:00
CitadelStationBot
8120e188f2 Automatic changelog generation for PR #4127 [ci skip] 2017-11-25 20:15:29 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
32ee1b6220 Adds spawn override system 2017-11-25 16:37:46 -06:00
Jordan Brown
20014e6f44 Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
Adds spawn override system
2017-11-25 16:37:46 -06:00
CitadelStationBot
cc4374d9c0 Butterdogs 2017-11-25 15:35:21 -06:00
Emmett Gaines
8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
CitadelStationBot
718716590b Implanted cultists can now be elected as master without being perma-deculted 2017-11-25 15:17:42 -06:00
MoreRobustThanYou
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
kevinz000
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
vuonojenmustaturska
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
WJohn
237f0fa8db Lowers rack layer to 2.8 (#33069) 2017-11-25 09:21:02 -06:00
deathride58
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
deathride58
6442a3a751 Update uplink_item.dm 2017-11-25 00:50:45 -05:00
deathride58
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
deathride58
55089be2b5 Merge pull request #4121 from Citadel-Station-13/upstream-merge-33049
[MIRROR] fix zombie reanimation
2017-11-25 05:49:23 +00:00
deathride58
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
deathride58
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
deathride58
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
Armhulen
ceee0c80e7 okay (#33058) 2017-11-24 22:39:44 -06:00
CitadelStationBot
0f3bfb23ec fix zombie reanimation 2017-11-24 22:36:30 -06:00
checkraisefold
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
Armhulen
d9c650970c making prs isn't even worth it anymore (#33056) 2017-11-24 22:36:22 -06:00
kevinz000
9bb564a138 Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game 2017-11-24 22:34:09 -06:00
CitadelStationBot
8d43210673 Cleans up a double assignment 2017-11-24 22:29:53 -06:00
Y0SH1M4S73R
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 Hardesty
d52d546463 Deny buckling when the user is inside lockers, mechs, etc. (#33015) 2017-11-24 22:29:40 -06:00
deathride58
186bcf6ef4 Update laserpointer.dm 2017-11-24 19:03:25 -05:00