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
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
33c3f0834e
Prevents sofas being wielded and thus transformed into normal chairs.
2019-09-21 20:01:42 +02:00
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
a6f4548349
Merge pull request #9295 from Ghommie/Ghommie-cit196
...
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
2019-09-17 22:03:29 -07:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
ca95d39a46
Slowing down police baton and tele baton speed.
2019-09-16 17:47:22 +02:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
4d805331df
Merge pull request #9229 from Trilbyspaceclone/patch-220
...
Gives emags 5 more uses on buy
2019-09-07 11:35:55 -07:00
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
3b40f73266
prayer beads no longer instantly deconvert, now inject holy water
2019-08-31 18:37:00 -04:00
f9e12378e9
Update ids.dm
2019-08-31 18:34:20 -04:00
a43a497114
Update ids.dm
2019-08-31 18:15:32 -04:00
b4f27b8841
allows renaming of non null rod holyweapons, fixes hypertool description
2019-08-31 18:05:09 -04:00
ba5021af5b
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
2019-08-31 02:55:29 -04:00
b69c928419
FOR THE EMPEROR
2019-08-30 16:50:03 -04:00
8e40e9d887
Merge pull request #9186 from Sishen1542/walklikeanegyptian
...
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
2019-08-28 00:02:39 -05:00
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
Ghommie