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 .
* Delete shuttle_loan.dm.rej
* Delete life.dm.rej
* Update life.dm
* Delete life.dm.rej
* compile
2017-07-31 23:41:22 -07:00
CitadelStationBot
3d53f888b1
Improves several Sound Loops' Performance
2017-07-31 14:35:16 -05: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
LetterJay
40216683e0
Update gibspawner.dm
2017-07-30 23:26:16 -05:00
CitadelStationBot
5da5e58ee5
Fixes a lot of eye damage procs
2017-07-30 08:16:38 -05:00
CitadelStationBot
f9a6ee8d76
Give c4 correct plastic_overlay ( #2183 )
2017-07-29 19:51:38 -07:00
CitadelStationBot
d16f68b4da
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #2173 )
2017-07-28 23:52:02 -07:00
CitadelStationBot
9d7820a81c
Fixes two consistency/grammar issues ( #2161 )
2017-07-28 23:51:36 -07:00
CitadelStationBot
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
CitadelStationBot
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
CitadelStationBot
47e20105a3
fixes instruments ( #2129 )
2017-07-25 15:33:45 -07:00
CitadelStationBot
5f8da9c34b
Prevents the captain's sabre from rustling jimmies ( #2113 )
2017-07-24 04:08:41 -07:00
CitadelStationBot
6a53670890
Fixes shower runtimes ( #2100 )
2017-07-24 04:08:16 -07:00
CitadelStationBot
2c567685fb
Instrument performance update - Scans for hearers every 4 ticks instead of per note. ( #2108 )
2017-07-24 04:06:52 -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
LetterJay
91a2d1ca0b
Update security.dm
2017-07-19 04:57:45 -05:00
LetterJay
98c2128386
Merge pull request #2052 from Citadel-Station-13/remove
...
removes the 'yiff in hell' graffiti artwork
2017-07-19 04:46:09 -05:00
CitadelStationBot
5bb567ecb0
Electric guitars now properly use .ogg sound files
2017-07-18 13:51:25 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
c294d781b6
Fixes flashbang stun times ( #2056 )
2017-07-18 06:14:29 -07:00
LetterJay
2d096997bc
removes the 'yiff in hell' graffiti artwork
2017-07-18 05:25:38 -05:00
CitadelStationBot
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
CitadelStationBot
c94e598b3f
Minor instrument code cleanup
2017-07-17 07:14:50 -05:00
CitadelStationBot
6f7e908c89
RPDs can now place disposals pipes on dense non-wall turfs ( #2035 )
2017-07-17 00:54:17 -07:00
CitadelStationBot
260a140f97
Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. ( #2034 )
2017-07-17 00:52:43 -07:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
LetterJay
8d31153fdc
Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223
...
[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
CitadelStationBot
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
CitadelStationBot
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
CitadelStationBot
738eaa1d54
Fix the attackby of the supermatter containment core ( #2024 )
2017-07-15 11:42:39 -07:00
kevinz000
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3 .
* Revert "Disease Refactor (#2021 )"
This reverts commit f2ac487927 .
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00