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 |
|
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 |
|
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 |
|
deathride58
|
5368aed6d5
|
Merge pull request #4129 from Citadel-Station-13/upstream-merge-33002
[MIRROR] Butterdogs
|
2017-11-26 02:16:03 +00: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 |
|
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 |
|
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 |
|
Jordan Brown
|
20014e6f44
|
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
Adds spawn override system
|
2017-11-25 16:37:46 -06:00 |
|
Emmett Gaines
|
8c11252d93
|
butterdogs (#33002)
|
2017-11-25 15:35:21 -06:00 |
|
MoreRobustThanYou
|
8f23eeb003
|
Fix #32755 (#33073)
|
2017-11-25 15:17:42 -06:00 |
|
kevinz000
|
606f403c5b
|
Fixes cryo rotation (#32992)
|
2017-11-25 13:27:38 -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 |
|
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 |
|
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 |
|
Armhulen
|
ceee0c80e7
|
okay (#33058)
|
2017-11-24 22:39:44 -06:00 |
|
checkraisefold
|
c6a68bad83
|
fix zombie reanimation (#33049)
lol
|
2017-11-24 22:36:30 -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 |
|
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 |
|
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 |
|
Dorsisdwarf
|
6dea43c709
|
Advanced Laserpointer Feline Interaction
|
2017-11-24 17:56:58 -06:00 |
|
deathride58
|
cf053af319
|
Update pandemic.dm
|
2017-11-24 18:50:23 -05:00 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
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 |
|
deathride58
|
754490a2d3
|
Update pandemic.dm
|
2017-11-24 18:02:51 -05:00 |
|
deathride58
|
5ee634aa31
|
Merge pull request #4099 from Citadel-Station-13/upstream-merge-32626
[MIRROR] Custom docker improvements
|
2017-11-24 23:01:35 +00:00 |
|
deathride58
|
44fb7ccdb7
|
Update drinkingglass.dm
|
2017-11-24 18:00:44 -05:00 |
|
deathride58
|
a591fb6019
|
Merge pull request #4100 from Citadel-Station-13/upstream-merge-32995
[MIRROR] Remove NODROP from water tank misters
|
2017-11-24 23:00:04 +00:00 |
|
deathride58
|
d04bbbdd67
|
Update step_triggers.dm
|
2017-11-24 17:59:18 -05:00 |
|
deathride58
|
7b2a926235
|
Update bump_teleporter.dm
|
2017-11-24 17:58:29 -05:00 |
|
deathride58
|
2b0bb76b9e
|
Merge pull request #4112 from Citadel-Station-13/upstream-merge-32985
[MIRROR] Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 22:57:26 +00:00 |
|
deathride58
|
c43dc3ab7a
|
Update Space_Station_13_areas.dm
|
2017-11-24 17:39:59 -05:00 |
|
Armhulen
|
a12a12b550
|
comma splice and ellipsis grammar fix (#33040)
* :*)
* i think this fixes splice
|
2017-11-24 15:21:11 -06:00 |
|
Leo
|
521277292d
|
Revises the_station_areas list
|
2017-11-24 14:12:53 -06:00 |
|
Leo
|
541b8db684
|
Merge pull request #32985 from YPOQ/airlockfix
Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 14:11:39 -06:00 |
|
Leo
|
e9daba0cd3
|
Merge pull request #32984 from ninjanomnom/thermite-burns
Fixes thermite burning lava
|
2017-11-24 14:10:26 -06:00 |
|