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
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
06271dfcff
aching special case.
2019-07-31 03:12:09 +02:00
991e4e8d41
Fixes and standarizes sword sheaths/scabbards overlays.
2019-07-31 02:43:40 +02:00
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
6c712a6931
Implementing nerfs.
2019-07-24 17:58:24 +02:00
b87442e633
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-07-19 20:09:16 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
a573689101
Merge pull request #8887 from Poojawa/last-word-hearing-psychics
...
Gang victory news report and last words for discord bot
2019-07-14 14:04:20 -07:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
4d895ae6c0
Gang victory news report and last words for discord bot
...
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
kevinz000