LetterJay
|
f2f1474123
|
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
|
2017-08-21 20:32:10 -05:00 |
|
LetterJay
|
83f4733027
|
Rename _circuitboard.dm to circuitboard.dm
|
2017-08-21 20:01:59 -05:00 |
|
CitadelStationBot
|
772299445e
|
Makes the Ark of the Clockwork Justicar much more fancy
|
2017-08-20 19:55:15 -05:00 |
|
LetterJay
|
ae9e4495f9
|
Merge branch 'master' into upstream-merge-29747
|
2017-08-20 09:53:17 -05:00 |
|
LetterJay
|
19b8a5a380
|
Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858
[MIRROR] Fixed sign description
|
2017-08-18 13:41:07 -05:00 |
|
LetterJay
|
db3622ca12
|
Update signs.dm
|
2017-08-18 11:18:33 -05:00 |
|
CitadelStationBot
|
72cf7083f6
|
Fixes leathercrafting recipies trying to build on the floor.
|
2017-08-17 09:19:09 -05:00 |
|
CitadelStationBot
|
c2d335b7da
|
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
|
2017-08-16 17:50:28 -05:00 |
|
LetterJay
|
0ffaf66d1f
|
Merge branch 'master' into upstream-merge-29690
|
2017-08-15 19:18:22 -05:00 |
|
LetterJay
|
ab27b63cf9
|
Merge branch 'master' into upstream-merge-29611
|
2017-08-15 18:55:12 -05:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -05:00 |
|
LetterJay
|
e5cd79a14e
|
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
[MIRROR] Moved can_trigger_gun to item/weapon parent
|
2017-08-14 18:53:38 -05:00 |
|
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 |
|
CitadelStationBot
|
97243fca3a
|
Moved can_trigger_gun to item/weapon parent
|
2017-08-14 16:05:43 -05:00 |
|
LetterJay
|
f088e812a9
|
Update flora.dm
|
2017-08-14 09:31:49 -05:00 |
|
CitadelStationBot
|
bd35823012
|
[ready]Makes bIcon better
|
2017-08-13 17:41:12 -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
|
7004797c8c
|
Fixed sign description
|
2017-08-13 01:28:08 -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 |
|
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 |
|
CitadelStationBot
|
4d19a89519
|
Removes a great amount of machinery copypasta with circuitboards.
|
2017-08-09 19:24:19 -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 |
|
CitadelStationBot
|
cc7ad81f79
|
Adds helpers to avoid << use
|
2017-08-08 22:28:16 -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
|
cdbaf5c4e8
|
Standardized CENTCOM spelling
|
2017-08-08 09:05:44 -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 |
|
CitadelStationBot
|
1b2efdcc1d
|
More Initialize() garbage
|
2017-08-06 18:02:51 -05:00 |
|
CitadelStationBot
|
7f7aed0112
|
Fixes showers breaking lighting objects.
|
2017-08-05 12:20:37 -05:00 |
|
CitadelStationBot
|
b0361c2c64
|
The inhands of the Dark Blessing chaplain weapon is now visible.
|
2017-08-05 12:20:27 -05:00 |
|
CitadelStationBot
|
8ca4b9d614
|
Clockcult Combat Rebalance + Conversion Rework (#2020)
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures
* Update tips.txt
* no one cares
* manual clockcult syn
|
2017-08-04 11:46:22 -07:00 |
|
CitadelStationBot
|
70826963dd
|
Tweaked SM overlay (#2243)
|
2017-08-04 08:43:02 -07:00 |
|
CitadelStationBot
|
ef715b7837
|
Removes all checks for subsystem existence (#2252)
|
2017-08-04 08:41:52 -07:00 |
|