CitadelStationBot
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30: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
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
ktccd
9918ed7d0c
Merge pull request #2204 from Citadel-Station-13/upstream-merge-29582
...
[MIRROR] Update labor camp stacker accepted sheets.
2017-07-31 22:04:28 +02:00
CitadelStationBot
29b26fbc3e
Update labor camp stacker accepted sheets.
2017-07-31 08:57:59 -05:00
CitadelStationBot
d3f488a5ee
Cyborgs grabbing ore works consistently
2017-07-31 07:10:17 -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
CitadelStationBot
2342c8f2bc
Fixes scythes cutting kudzu ( #2185 )
2017-07-29 19:50:24 -07:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07: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
41101906c4
Adds logging for the blood contract
2017-07-21 18:28:11 -05:00
CitadelStationBot
c8763c994c
Ore satchels no longer have infinite capacity
2017-07-21 18:20:53 -05:00
CitadelStationBot
94f7ec2380
The blood-drunk miner will fire its KA a bit more often
2017-07-20 22:25:48 -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
bf98e0d417
Picking up ores by crossing them no longer spams your chat box
2017-07-18 19:25:10 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
CitadelStationBot
63ffbdf090
Fixes cleave conditions for the cleaving saw ( #2006 )
2017-07-14 19:30:06 -07:00
CitadelStationBot
92c6b7b445
Adds a 'nemesis faction' system to transforming weapons
2017-07-13 17:46:51 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
LetterJay
ff0c889a29
Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140
...
[MIRROR] Removes now-unnecessary obj_integrity definitions
2017-07-09 23:06:13 -05:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
CitadelStationBot
9d85345b6d
Fixes entire stacks of goliath plates being used on mechs
2017-07-09 06:44:46 -05:00
LetterJay
8bfda97c09
Merge pull request #1918 from Citadel-Station-13/upstream-merge-28998
...
[MIRROR] Actually fixes wormhole jaunters, and no it was not my fault.
2017-07-06 22:47:51 -05:00
LetterJay
b87632669e
Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061
...
[MIRROR] Warp cubes are slightly less instant but way cooler
2017-07-06 22:47:38 -05:00
CitadelStationBot
ee830e7dc8
Actually fixes wormhole jaunters, and no it was not my fault.
2017-07-06 20:15:44 -05:00
CitadelStationBot
a101497539
Warp cubes are slightly less instant but way cooler
2017-07-06 20:12:38 -05:00
CitadelStationBot
b6b999b15a
Lowercased computer names
2017-07-06 20:09:27 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
CitadelStationBot
b5025653b6
Luxury shelter capsules' display cases no longer spawn offhand objects ( Fixes #28589 ) ( #1694 )
2017-06-30 20:57:00 -07:00
katnep
45ce2c4caa
STIMPACKS POWERCREEP EDITION ( #1828 )
...
* STIMPACKS POWERCREEP EDITION
added stimpacks and stimpack kits to the vendor
as well as my patented powercreep kit of survival pens
* FIXING IT
Having my own file is overrated
* more fixes
Still fixing it
* FINAL FORM
Fixed it.jpeg
* FINAL FIX
THIS IS FIXING BEYOND FIXING
* GO BEYOND
* IM GONNA PUNCH IT
2017-06-30 20:12:10 -07:00
CitadelStationBot
237691f6fd
[MIRROR] Fixes problems that were in the original PR ( #1419 )
...
* Fixes problems that were in the original PR
* rej cleanup
* Wow CSS is even worse than byond
2017-06-28 03:02:50 -05:00
CitadelStationBot
32f904356d
[MIRROR] Removes check_tick from ORM ui_data ( #1415 )
...
* Removes check_tick from ORM ui_data
* Update machine_redemption.dm
* Delete machine_redemption.dm.rej
2017-06-28 02:28:00 -05:00
CitadelStationBot
65736b7e23
[MIRROR] Ports the Ore Redemption Machine to TGUI ( #1414 )
...
* Ports the Ore Redemption Machine to TGUI
* Update tgui.css
* Update tgui.js
* Delete tgui.css.rej
* Delete tgui.js.rej
2017-06-28 02:24:55 -05:00
LetterJay
9803f24547
Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760
...
[MIRROR] Adds some neat tiles and walls for use on lavaland
2017-06-26 10:10:00 -05:00
CitadelStationBot
ac33b9defb
Adds some neat tiles and walls for use on lavaland
2017-06-26 09:19:17 -05:00
CitadelStationBot
5cf2065432
Ninja Dash
2017-06-26 08:57:46 -05:00
LetterJay
43d4a06266
Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543
...
[MIRROR] Fixes crusher trophies not properly being added
2017-06-26 06:13:46 -05:00
CitadelStationBot
384234a7d9
Fixes the kinetic crusher not emitting light
2017-06-23 13:49:37 -05:00
LetterJay
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
CitadelStationBot
2990610c99
Fixes crusher trophies not properly being added
2017-06-18 18:42:05 -05:00
CitadelStationBot
88e6bf82d5
adds proper gibtonite detonation timing ( #1462 )
2017-06-17 13:32:35 -07:00
CitadelStationBot
db01827ede
Examining an ore box you are adjacent to shows its contents.
2017-06-15 20:26:14 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
e04f0310af
ore coin crossed runtime fix
2017-06-13 21:02:34 -05:00
CitadelStationBot
33eb60747f
Refactored advanced camera consoles ( #1576 )
2017-06-13 13:39:47 -07:00