LetterJay
83f4733027
Rename _circuitboard.dm to circuitboard.dm
2017-08-21 20:01:59 -05:00
LetterJay
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
CitadelStationBot
72cf7083f6
Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 09:19:09 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -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
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
CitadelStationBot
97243fca3a
Moved can_trigger_gun to item/weapon parent
2017-08-14 16:05:43 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
CitadelStationBot
1e3ea07d8b
Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 01:28:24 -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
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
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
CitadelStationBot
5eadc197cf
Fix RCL loading
2017-08-08 14:59:10 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
1b2efdcc1d
More Initialize() garbage
2017-08-06 18:02:51 -05:00
CitadelStationBot
b0361c2c64
The inhands of the Dark Blessing chaplain weapon is now visible.
2017-08-05 12:20:27 -05:00
CitadelStationBot
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
CitadelStationBot
9449004c36
Gives an initialize hint to stacks, boxes, closets and bots ( #2256 )
2017-08-04 08:41:04 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
LetterJay
5734a2c7ed
Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610
...
[MIRROR] Fixes devil pitchforks being uninitialized
2017-08-02 06:06:33 -05:00
CitadelStationBot
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
1e82ad9d3e
Fixes devil pitchforks being uninitialized
2017-08-01 17:57:44 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
f9a6ee8d76
Give c4 correct plastic_overlay ( #2183 )
2017-07-29 19:51:38 -07:00
CitadelStationBot
9d7820a81c
Fixes two consistency/grammar issues ( #2161 )
2017-07-28 23:51:36 -07:00
CitadelStationBot
5f8da9c34b
Prevents the captain's sabre from rustling jimmies ( #2113 )
2017-07-24 04:08:41 -07:00
CitadelStationBot
6522ca6130
Nuke screwdrivers are no longer randomly colored ( #2110 )
2017-07-24 04:06:16 -07:00
CitadelStationBot
f14fab916b
Supermatter sliver theft now works ( #2115 )
2017-07-24 04:05:55 -07:00
LetterJay
564f1bc533
Merge pull request #2092 from Citadel-Station-13/upstream-merge-29409
...
[MIRROR] Fixes a drone ping issue
2017-07-23 06:52:41 -05:00
LetterJay
6a961f7348
Merge pull request #2093 from Citadel-Station-13/upstream-merge-29401
...
[MIRROR] Ore satchels no longer have infinite capacity
2017-07-23 06:52:26 -05:00
CitadelStationBot
e937aeaa51
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.)
2017-07-21 18:26:06 -05:00
CitadelStationBot
c8763c994c
Ore satchels no longer have infinite capacity
2017-07-21 18:20:53 -05:00
CitadelStationBot
4fbdf9851d
Fixes a drone ping issue
2017-07-21 18:19:49 -05:00
CitadelStationBot
64f7a14e07
Adds investigate logs to portals
2017-07-20 22:26:01 -05:00
LetterJay
cff128c5d5
Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180
...
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
2017-07-19 13:37:25 -05:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
e6d6478482
Small belt overlay rewrite, and tool overlays for toolbelts
2017-07-19 09:30:06 -05:00
LetterJay
6fe243b647
Merge pull request #2067 from Citadel-Station-13/upstream-merge-29320
...
[MIRROR] Electric guitars now properly use .ogg sound files
2017-07-19 09:21:22 -05:00
