Commit Graph

1235 Commits

Author SHA1 Message Date
LetterJay
6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
LetterJay
300fc768a5 Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
2017-08-14 18:37:28 -05:00
LetterJay
1bb5e19596 Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695
[MIRROR] flora.dm initialize hint
2017-08-14 18:36:58 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
f088e812a9 Update flora.dm 2017-08-14 09:31:49 -05:00
LetterJay
123454c45a Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846
[MIRROR] Makes mulligan antag check for gamemode required players
2017-08-14 08:21:24 -05:00
CitadelStationBot
e986657b16 Makes mulligan antag check for gamemode required players 2017-08-14 06:25:03 -05:00
CitadelStationBot
e354c9f289 Fixes turf slipping 2017-08-13 18:00:36 -05:00
LetterJay
64da23febb Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 09:53:11 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
CitadelStationBot
80f1fb8c58 Fix fireaxe cabinets spawned with broken icons 2017-08-13 01:28:03 -05:00
LetterJay
a9a7807473 Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819
[MIRROR] His Grace now shows up on the orbit list
2017-08-12 06:36:57 -05:00
LetterJay
dd6c9d6a04 Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811
[MIRROR] Fixes cable cuff inhand
2017-08-12 06:36:15 -05:00
LetterJay
122727059b Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804
[MIRROR] Ports weaponry to Initialize
2017-08-12 06:35:25 -05:00
LetterJay
c174eb3f5d Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803
[MIRROR] Ports weapons to Initialize()
2017-08-12 06:35:09 -05:00
LetterJay
6b6e5d0018 Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805
[MIRROR] decapitalizes flyswatter in weaponry.dm
2017-08-12 06:34:28 -05:00
LetterJay
e783997250 Merge pull request #2295 from Citadel-Station-13/upstream-merge-29742
[MIRROR] GM completion check and mulligan now check to see if players are logged out
2017-08-12 06:33:44 -05:00
CitadelStationBot
582a106d8e His Grace now shows up on the orbit list 2017-08-11 15:09:24 -05:00
CitadelStationBot
84076d7bb9 intialize() supermatter sword (#2332) 2017-08-11 12:29:51 -07:00
CitadelStationBot
6c6d8e5193 Fixes cable cuff inhand 2017-08-11 02:52:25 -05:00
CitadelStationBot
dab46b002c Ports weaponry to Initialize 2017-08-11 02:50:20 -05:00
CitadelStationBot
fa19568a06 Ports weapons to Initialize() 2017-08-11 02:49:11 -05:00
CitadelStationBot
f6da0f89c3 decapitalizes flyswatter in weaponry.dm 2017-08-10 08:09:25 -05:00
LetterJay
43c774b72e Merge pull request #2319 from Citadel-Station-13/upstream-merge-29781
[MIRROR] Fixes swarmer shells having no ghost notifications
2017-08-09 11:25:02 -05:00
CitadelStationBot
83c546f143 Fixes swarmer shells having no ghost notifications 2017-08-09 03:26:14 -05:00
CitadelStationBot
943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -05:00
LetterJay
26ca12fb04 Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773
[MIRROR] Fix RCL loading
2017-08-09 02:22:09 -05:00
LetterJay
7b371b02e3 Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756
[MIRROR] Oocky in icky descriptions
2017-08-09 02:21:38 -05:00
LetterJay
f68287e31e Merge pull request #2305 from Citadel-Station-13/upstream-merge-29766
[MIRROR] Belligerent now has a visible indicator
2017-08-09 02:20:51 -05:00
LetterJay
94386375a8 Merge pull request #2304 from Citadel-Station-13/upstream-merge-29767
[MIRROR] Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-09 02:20:42 -05:00
CitadelStationBot
5eadc197cf Fix RCL loading 2017-08-08 14:59:10 -05:00
CitadelStationBot
fcd1a2dc86 Oocky in icky descriptions 2017-08-08 09:05:58 -05:00
CitadelStationBot
fb86e03544 Belligerent now has a visible indicator 2017-08-08 09:05:54 -05:00
CitadelStationBot
68bbda4b4d Mechs can no longer open cult doors if the person inside is not a cultist 2017-08-08 09:05:50 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
40a8449f11 GM completion check and mulligan now check to see if players are logged out 2017-08-07 12:26:20 -05:00
LetterJay
41f42aabca Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724
[MIRROR] More Initialize() garbage
2017-08-07 07:26:53 -05:00
LetterJay
8386d5e610 Merge pull request #2290 from Citadel-Station-13/upstream-merge-29735
[MIRROR] Fixes being able to "stomp out" sigils with telekinesis
2017-08-07 07:26:30 -05:00
LetterJay
fc450fd561 Merge pull request #2291 from Citadel-Station-13/upstream-merge-29725
[MIRROR] Sounds played with sound_to_playing_players are less tinny
2017-08-07 07:26:18 -05:00
LetterJay
ecb68a4ccc Merge pull request #2287 from Citadel-Station-13/upstream-merge-29734
[MIRROR] Fixes certain things clearing weather overlays
2017-08-07 07:24:05 -05:00
LetterJay
b449843a1e Merge pull request #2270 from Citadel-Station-13/upstream-merge-29711
[MIRROR] Fixes oversight with APCs using areastring
2017-08-07 07:18:35 -05:00
LetterJay
0dcd93ad73 Merge pull request #2268 from Citadel-Station-13/upstream-merge-29706
[MIRROR] Fixes showers breaking lighting objects.
2017-08-07 07:18:17 -05:00
LetterJay
c5c25639ee Merge pull request #2267 from Citadel-Station-13/upstream-merge-29654
[MIRROR] Fixes vendors not returning an Initialize hint
2017-08-07 07:17:39 -05:00
LetterJay
6c122ea563 Merge pull request #2269 from Citadel-Station-13/upstream-merge-29691
[MIRROR] Replaces blob's send intercept sleep() with addtimer
2017-08-07 07:17:24 -05:00
CitadelStationBot
1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot
d071a78888 Sounds played with sound_to_playing_players are less tinny 2017-08-06 18:02:47 -05:00
CitadelStationBot
e80f1dba99 Fixes being able to "stomp out" sigils with telekinesis 2017-08-06 18:02:43 -05:00
CitadelStationBot
5d80d2df4b Fixes certain things clearing weather overlays 2017-08-06 18:02:33 -05:00
CitadelStationBot
a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot
90a7ead961 [MIRROR] The AI's internal camera functions better (#2219)
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
2017-08-05 10:24:58 -07:00