CitadelStationBot
|
cb755fc6d0
|
Adds three unique kinetic accelerator modules to necropolis chests
|
2017-06-01 15:32:16 -05:00 |
|
LetterJay
|
402b52229f
|
shit always breaks somehow.
|
2017-05-30 18:37:28 -05:00 |
|
LetterJay
|
81e4f39733
|
Merge branch 'master' into upstream-merge-27669
|
2017-05-30 17:02:11 -05:00 |
|
LetterJay
|
f2730839d4
|
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR] Refactors explosions
|
2017-05-30 15:15:51 -05:00 |
|
LetterJay
|
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 |
|
CitadelStationBot
|
a1ebd8c791
|
Refactors how diagonal smoothing underlays work (#1187)
|
2017-05-27 13:40:09 -07:00 |
|
CitadelStationBot
|
c5b0f01dcd
|
Splits up mine_items.dm
|
2017-05-26 13:19:42 -05:00 |
|
CitadelStationBot
|
11344c4682
|
Refactors explosions
|
2017-05-24 16:45:00 -05:00 |
|
CitadelStationBot
|
6fb8aa7ee1
|
Adds marker beacons to mining as a vendible item
|
2017-05-24 16:32:43 -05:00 |
|
CitadelStationBot
|
88d88741f5
|
Splits equipment.dm into several component files
|
2017-05-24 08:28:08 -05:00 |
|
LetterJay
|
febefa0c78
|
Something I broke in a previous PR that I didn't see
|
2017-05-23 10:11:19 -05:00 |
|
LetterJay
|
958afdf037
|
oops
|
2017-05-23 06:29:15 -05:00 |
|
LetterJay
|
2fcc8fdc25
|
magic
|
2017-05-23 06:23:29 -05:00 |
|
LetterJay
|
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 |
|
CitadelStationBot
|
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 |
|
LetterJay
|
abbacd2c89
|
Merge branch 'master' into upstream-merge-27160
|
2017-05-22 16:29:43 -05:00 |
|
LetterJay
|
c414bcd26e
|
Update equipment.dm
|
2017-05-22 13:13:16 -05:00 |
|
LetterJay
|
3f62929340
|
Merge branch 'master' into upstream-merge-27379
|
2017-05-22 12:45:18 -05:00 |
|
LetterJay
|
3548ed5e3e
|
i'll fix this in another PR
|
2017-05-22 12:27:59 -05:00 |
|
LetterJay
|
73dea85b15
|
commit/rej cleanup
|
2017-05-22 11:24:17 -05:00 |
|
CitadelStationBot
|
8abbf12132
|
Resonator fields now visually show how long they have until they burst
|
2017-05-21 22:28:36 -05:00 |
|
kevinz000
|
7e2cebe1db
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-21 17:50:29 -07:00 |
|
CitadelStationBot
|
cd82124ef5
|
Survival pod doors will properly turn if on shuttles (#1070)
|
2017-05-21 17:43:53 -07:00 |
|
CitadelStationBot
|
e224a47f53
|
Two more types of Legion and makes environment_smash levels into defines
|
2017-05-21 02:52:23 -05:00 |
|
Poojawa
|
45ba084c6a
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-20 23:26:28 -05:00 |
|
CitadelStationBot
|
5455e28d76
|
Aux Base Fixes (#1067)
|
2017-05-20 23:20:45 -05:00 |
|
CitadelStationBot
|
448dc20c2b
|
Proto-kinetic crushers are significantly better
|
2017-05-20 12:42:11 -05:00 |
|
CitadelStationBot
|
a430e24555
|
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-18 16:38:09 -05:00 |
|
CitadelStationBot
|
d5b0150e99
|
Buffs hierophant club
|
2017-05-18 16:36:38 -05:00 |
|
CitadelStationBot
|
0ad1bb5259
|
Adds a disk slot to the ORM, to allow the uploading of new smelter designs (#980)
|
2017-05-18 11:53:47 -05:00 |
|
CitadelStationBot
|
230b2e6fc8
|
Fixes the ore redemption machine's sheet amount upgrade
|
2017-05-14 18:43:32 -05:00 |
|
LetterJay
|
d64e569d6c
|
Merge pull request #954 from Citadel-Station-13/upstream-merge-27199
[MIRROR] Free Golems can purchase their own royal capes
|
2017-05-14 16:27:25 -04:00 |
|
LetterJay
|
52fa1f314f
|
Merge branch 'master' into upstream-merge-26760
|
2017-05-14 01:02:26 -04:00 |
|
CitadelStationBot
|
73101cbd88
|
Free Golems can purchase their own royal capes
|
2017-05-13 21:17:37 -05:00 |
|
CitadelStationBot
|
ccf4550ac1
|
Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue (#890)
|
2017-05-10 16:04:21 -07:00 |
|
kevinz000
|
bd8bfe1327
|
Merge pull request #684 from Citadel-Station-13/upstream-merge-26728
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
|
2017-05-07 22:41:24 -07:00 |
|
CitadelStationBot
|
d7bdb49283
|
ORM fixes
|
2017-05-06 16:20:39 -05:00 |
|
LetterJay
|
a57190b9c5
|
Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
[MIRROR] Ore redemption machine cleanup
|
2017-05-02 12:26:28 -05:00 |
|
LetterJay
|
6310292531
|
woo
|
2017-05-02 11:19:14 -05:00 |
|
LetterJay
|
3b8484b52b
|
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
|
2017-05-02 05:13:49 -05:00 |
|
CitadelStationBot
|
036109de58
|
Changes a bunch of hrefs to the proper defines
|
2017-05-02 02:20:07 -05:00 |
|
CitadelStationBot
|
e2a95703de
|
Ore redemption machine cleanup
|
2017-05-01 11:54:33 -05:00 |
|
CitadelStationBot
|
55b9c06e63
|
A bunch of sparks to do_sparks
|
2017-05-01 08:36:04 -05:00 |
|
LetterJay
|
991fb8335c
|
manual merge
|
2017-04-29 11:42:28 -05:00 |
|
CitadelStationBot
|
4da7414339
|
Old ore processor cleanup
|
2017-04-29 03:46:03 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
CitadelStationBot
|
a905c15dad
|
Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
|
2017-04-26 08:18:35 -05:00 |
|
CitadelStationBot
|
01f99160ad
|
Prevents fultons from transporting items out of inventories
|
2017-04-21 17:26:04 -05:00 |
|
CitadelStationBot
|
e832d79be9
|
Fixes some closets populating in New() (#497)
|
2017-04-20 22:03:09 -05:00 |
|
LetterJay
|
98463ad892
|
Merge pull request #469 from Citadel-Station-13/upstream-merge-26320
[MIRROR] [s] Fixed ORM exploit
|
2017-04-18 20:34:04 -05:00 |
|