c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
d6f540faf7
Merge pull request #9796 from Ghommie/Ghommie-cit347
...
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
bd650e53da
Merge pull request #9795 from Ghommie/Ghommie-cit346
...
Unmodularize areas.
2019-11-14 16:24:36 -07:00
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
b83f92be0e
Unmodularize airlocks.
2019-11-13 06:50:35 +01:00
f55a602319
Unmodularize areas.
2019-11-13 06:13:18 +01:00
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
e977ba6729
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-10 23:17:58 +01:00
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
d9fd6cd176
Merge pull request #9735 from Ghommie/Ghommie-cit325
...
Unmodularizing 2/3 of the sounds folder.
2019-11-10 11:45:28 -07:00
92455b5b8c
Merge pull request #9695 from Ghommie/Ghommie-cit311
...
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
d48f1aad8a
Yea, moving a few of them to voices. Do you vocalize?
2019-11-07 00:48:56 +01:00
9cac543a2b
Unmodularize secway and turfs
2019-11-05 05:47:25 +01:00
29daa0c908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-04 22:59:24 +01:00
7e4aef46d9
Unmodularize and update pAI/Intellicards very slighty.
2019-11-03 04:23:31 +01:00
005c87bdf6
I'm making a joke title, don't ban me github.
2019-10-30 01:31:29 +01:00
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
efdb850129
Gang dominator sprite update.
2019-10-27 23:59:40 +01:00
49e52eee05
Merge pull request #9603 from Ghommie/Ghommie-cit267
...
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
c1f84da39e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272
2019-10-25 12:26:17 +02:00
85b35433b2
Unmodularize Eutactic Blades.
2019-10-25 00:14:38 +02:00
f035d77b53
Slips.
2019-10-24 22:50:53 +02:00
a50606bb67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
ffeae20daa
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
2019-10-18 06:01:52 -05:00
9c21659afc
Merge pull request #9483 from ZeroNetAlpha/toylathe-fix
...
Update toylathe.dm
2019-10-17 12:55:43 -07:00
64819066c6
Update toylathe.dm
...
Think I fixed it.
2019-10-16 01:15:35 -05:00
bcb11a471d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-13 19:14:16 -05:00
adeb33cdae
Merge pull request #9463 from Owai-Seek/minor-fixes
...
Updating Kinkmate item-list
2019-10-13 13:54:26 -07:00
023d031f15
Update toylathe.dm
...
Cleans up the autoylathe code, brings it back in line with the current autolathe. Also fixes an issue with the autoylathe not updating it's screen on click.
2019-10-13 14:40:19 -05:00
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
6709dbd161
Requested Change
2019-10-11 13:25:23 -04:00
2c54e7390d
Update vending.dm
2019-10-11 02:54:44 -04:00
7a454e448a
I forgot the one item I wanted to add.
2019-10-11 02:54:23 -04:00
3afbc5733c
Update vending.dm
2019-10-11 01:14:09 -04:00
2bce423ec3
Added a -ton- of stuff to the Kinkmate
2019-10-10 14:08:14 -04:00
b233d3556e
Merge pull request #9439 from JTGSZ/dominatorfix
...
Fixes Dominator countdown continuing after BoH movement, tweaks view amount
2019-10-10 02:12:55 -07:00
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
5024c8664b
Lowers view amount of turfs, fixes BOH moving dominator
2019-10-08 01:02:45 -04:00
de117afd8b
Merge pull request #9410 from Poojawa/cryopod-tweaks
...
Fixes Cryopod quirks, makes the menu not complete shit
2019-10-07 18:24:38 -05:00
0716b48a99
unmodularize it
2019-10-04 06:56:57 -05:00
828fe6e555
Merge pull request #9385 from Sishen1542/hypereut
...
fixing divine lightblade (chaplain hypereut) having energy reflect
2019-10-03 23:15:29 -07:00
8b766130f8
Update eutactic_blades.dm
2019-10-02 12:48:17 -04:00
a2a6fa17fe
Update eutactic_blades.dm
2019-10-01 23:33:14 -04:00
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
d7d4e3cbe2
Merge pull request #9349 from Ghommie/Ghommie-cit210
...
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
ee8f1022cc
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-24 02:02:24 +02:00
Ghommie