Commit Graph

3693 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
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
5368aed6d5 Merge pull request #4129 from Citadel-Station-13/upstream-merge-33002
[MIRROR] Butterdogs
2017-11-26 02:16:03 +00:00
Emmett Gaines
8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
kevinz000
606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -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
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
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
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
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
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
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
Armhulen
a12a12b550 comma splice and ellipsis grammar fix (#33040)
* :*)

* i think this fixes splice
2017-11-24 15:21:11 -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
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
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
deathride58
c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
deathride58
d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
deathride58
cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801
[MIRROR] Adds ip and cid to banning panel ban search
2017-11-23 01:04:20 +00:00
deathride58
ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-23 01:03:38 +00:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
c97e8805f6 Update hostile.dm 2017-11-22 17:53:36 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
Jordie
31b9828285 Adds ip and cid to banning panel ban search (#32801)
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
2017-11-22 15:38:07 -06:00
oranges
7c1fe79635 Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
GupGup
8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale 2017-11-22 15:24:21 -06:00
deathride58
2e9f3bc1c0 Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968
[MIRROR] Fixes bartender suit having an adjust state
2017-11-22 20:50:45 +00:00
deathride58
bf6f920754 Merge pull request #4059 from Citadel-Station-13/upstream-merge-32944
[MIRROR] Update Turbine computer to use TGUI
2017-11-22 20:49:58 +00:00