8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
b5025653b6
Luxury shelter capsules' display cases no longer spawn offhand objects ( Fixes #28589 ) ( #1694 )
2017-06-30 20:57:00 -07:00
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
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
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
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
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
ac33b9defb
Adds some neat tiles and walls for use on lavaland
2017-06-26 09:19:17 -05:00
5cf2065432
Ninja Dash
2017-06-26 08:57:46 -05:00
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
384234a7d9
Fixes the kinetic crusher not emitting light
2017-06-23 13:49:37 -05:00
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
2990610c99
Fixes crusher trophies not properly being added
2017-06-18 18:42:05 -05:00
88e6bf82d5
adds proper gibtonite detonation timing ( #1462 )
2017-06-17 13:32:35 -07:00
db01827ede
Examining an ore box you are adjacent to shows its contents.
2017-06-15 20:26:14 -05:00
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
e04f0310af
ore coin crossed runtime fix
2017-06-13 21:02:34 -05:00
33eb60747f
Refactored advanced camera consoles ( #1576 )
2017-06-13 13:39:47 -07:00
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
57dc205514
Adds the ability to attach papers and photos to airlocks
2017-06-11 17:29:48 -05:00
28d4372aa0
upstream-merge-27852
2017-06-11 00:20:55 -05:00
923c5b9035
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
...
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
2017-06-08 03:35:23 -05:00
ad97147dfe
Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870
...
[MIRROR] Fixes ghosts using marker beacon
2017-06-08 03:31:22 -05:00
35b56f3075
Merge branch 'master' into upstream-merge-27773
2017-06-06 09:05:26 -05:00
54549d43a2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728
2017-06-05 23:07:52 -05:00
b5d2cf3c99
[READY] Stacks will change item_states and w_class based on how full they are. ( #1370 )
2017-06-04 09:08:33 -07:00
c77607e411
This doesn't do anything ( #1390 )
2017-06-04 09:05:28 -07:00
cb755fc6d0
Adds three unique kinetic accelerator modules to necropolis chests
2017-06-01 15:32:16 -05:00
8afd024a65
Fixes ghosts using marker beacon
2017-05-31 08:48:04 -05:00
402b52229f
shit always breaks somehow.
2017-05-30 18:37:28 -05:00
4f9c8a0869
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 17:05:54 -05:00
81e4f39733
Merge branch 'master' into upstream-merge-27669
2017-05-30 17:02:11 -05:00
f2730839d4
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
...
[MIRROR] Refactors explosions
2017-05-30 15:15:51 -05:00
9a64d4731c
Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589
...
[MIRROR] Adds marker beacons to mining as a vendible item
2017-05-30 15:02:44 -05:00
afbfb66386
Splits mining_mobs.dm into separate files
2017-05-29 01:17:13 -05:00
c07034f45a
The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
2017-05-27 20:55:08 -05:00
a1ebd8c791
Refactors how diagonal smoothing underlays work ( #1187 )
2017-05-27 13:40:09 -07:00
c5b0f01dcd
Splits up mine_items.dm
2017-05-26 13:19:42 -05:00
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
6fb8aa7ee1
Adds marker beacons to mining as a vendible item
2017-05-24 16:32:43 -05:00
88d88741f5
Splits equipment.dm into several component files
2017-05-24 08:28:08 -05:00
febefa0c78
Something I broke in a previous PR that I didn't see
2017-05-23 10:11:19 -05:00
958afdf037
oops
2017-05-23 06:29:15 -05:00
2fcc8fdc25
magic
2017-05-23 06:23:29 -05:00
2083b0c990
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467
2017-05-23 05:31:00 -05:00
6b4b6ee70d
Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
2017-05-22 22:21:20 -05:00
abbacd2c89
Merge branch 'master' into upstream-merge-27160
2017-05-22 16:29:43 -05:00
c414bcd26e
Update equipment.dm
2017-05-22 13:13:16 -05:00
3f62929340
Merge branch 'master' into upstream-merge-27379
2017-05-22 12:45:18 -05:00
3548ed5e3e
i'll fix this in another PR
2017-05-22 12:27:59 -05:00
CitadelStationBot