Commit Graph

6444 Commits

Author SHA1 Message Date
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
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
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
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
a45d889fd6 Merge pull request #32891 from CosmicScientist/bolas
Re-enables bolas in crafting
2017-11-24 14:06:10 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
Cruix
a29d4a5d11 Fixed mobs getting rotated by shuttles even if they are not moved (#33026) 2017-11-24 13:00:34 -06:00
MoreRobustThanYou
3757be6ce2 Makes reverse pulling only apply to dense objects (#33024)
* Makes reverse pulling only apply to dense objects

* CACHE CACHE CACHE!
2017-11-24 13:00:10 -06:00
Jordan Brown
dc0310eb5d Adds a config to optionally hard reboot DD (#33006) 2017-11-24 13:00:02 -06:00
Jordan Brown
fe1d69c35d IRC message if client mob ends up in nullspace (#33004)
Only if no admins are online
2017-11-24 12:59:54 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
Tad Hardesty
9806de310d Remove NODROP from water tank misters (#32995) 2017-11-24 12:59:25 -06:00
Emmett Gaines
0b07f80b62 custom docker improvements (#32626) 2017-11-24 12:59:17 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58
d5d89a57b4 Update stock_parts.dm 2017-11-23 23:50:25 -05:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
kevinz000
399c2ebfcc Update _compile_options.dm 2017-11-23 16:37:49 -08:00
deathride58
751b61a9ab Merge pull request #4065 from Poojawa/layering-memes
Edited breast sprites
2017-11-24 00:20:29 +00:00
deathride58
de27afbc61 Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045
[MIRROR] Fixes component runtimes
2017-11-24 00:19:42 +00:00
deathride58
f83ce9cd11 Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937
[MIRROR] Simple wall turret buff
2017-11-24 00:19:24 +00:00
deathride58
6d6afcd588 Merge pull request #4091 from Citadel-Station-13/upstream-merge-33041
[MIRROR] Lowers the stress the dna console puts on the string tree
2017-11-24 00:11:16 +00:00
deathride58
eb722bf59f Merge branch 'master' into upstream-merge-33045 2017-11-24 00:10:36 +00:00
Jordan Brown
b2bb942817 Fixes component runtimes 2017-11-23 13:12:38 -06:00
Jordan Brown
8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452
Lowers the stress the dna console puts on the string tree
2017-11-23 12:07:17 -06:00