Poojawa
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
Poojawa
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
kevinz000
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
kevinz000
63d2273a75
Merge pull request #9220 from Thalpy/Catnip-Furranium
...
Allows Furranium grown from organic sources.
2019-09-13 10:41:07 -07:00
Poojawa
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
Poojawa
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
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
nik707
de055fe289
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
...
[Consider speedmerging] Fixes the infinite clone problem.
2019-09-08 19:46:08 -04:00
Fermi
033057d380
OOPS
2019-09-08 02:55:40 +01:00
Linzolle
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
kevinz000
4d805331df
Merge pull request #9229 from Trilbyspaceclone/patch-220
...
Gives emags 5 more uses on buy
2019-09-07 11:35:55 -07:00
kevinz000
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
BlackMajor
fbc2d3c8fe
Ports dogborg sprites from RP to main
...
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
nik707
67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
nik707
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
Sishen
3b40f73266
prayer beads no longer instantly deconvert, now inject holy water
2019-08-31 18:37:00 -04:00
Trilbyspaceclone
f9e12378e9
Update ids.dm
2019-08-31 18:34:20 -04:00
Trilbyspaceclone
a43a497114
Update ids.dm
2019-08-31 18:15:32 -04:00
Sishen
b4f27b8841
allows renaming of non null rod holyweapons, fixes hypertool description
2019-08-31 18:05:09 -04:00
Sishen
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
Sishen
b69c928419
FOR THE EMPEROR
2019-08-30 16:50:03 -04:00
Fermi
85fc947dd7
Allows furranium grown from organic sources.
2019-08-30 20:44:39 +01:00
nik707
dfdbb23d99
Merge pull request #9178 from deathride58/polyfix
...
fixes the poly tgs command not working at all
2019-08-29 19:45:11 -05:00
nik707
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
nik707
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
Ghommie
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
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
deathride58
1376791e7a
fixes the poly tgs command not working at all
2019-08-22 20:13:56 -04:00
Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
Poojawa
a0308a2760
Enables Poly phrases on tgs commands
2019-08-18 08:29:28 -05:00
kevinz000
9071917e72
Merge pull request #9088 from Poojawa/blurry-runtimes
...
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
kevinz000
ce62780ba0
Merge pull request #9095 from fludd12/snowflake-b-gone
...
Un-snowflakes My Custom Item
2019-08-16 17:04:45 -07:00
kevinz000
97306ff53c
Merge pull request #9107 from deathride58/fixesarest
...
Fixes handcuffs being impossible to actually resist out of
2019-08-16 16:57:36 -07:00
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
Poojawa
017a3111ec
Yeah this is a much, much better way of doing it.
2019-08-15 08:37:10 -05:00
Poojawa
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
Sishen
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
deathride58
7879d1ce13
Merge pull request #9103 from Citadel-Station-13/atmosberet
...
Donator item
2019-08-14 15:44:24 -04:00
deathride58
2406254faa
Merge pull request #9100 from cebutris/got-milk
...
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
Fermi
5a9b2bcad7
Added COORD
2019-08-12 05:10:46 +01:00
Fermi
ae1191a469
Changes an oversight (and a unintended wah!)
2019-08-12 05:10:05 +01:00
kevinz000
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
deathride58
675c042958
Update __donator.dm
2019-08-11 08:38:13 -04:00
deathride58
5dddb11773
Fixes handcuffs being impossible to actually resist out of
2019-08-11 08:37:00 -04:00
Jay
f17aea268c
Donator item
2019-08-11 01:07:20 -05:00
Cebutris
df136ab96c
lactation is now a preference
2019-08-10 23:28:16 -04:00
Fel
5dc2124df0
Update custom_items.dm
2019-08-09 19:00:21 -04:00
Fermi
eb9e6a041d
Ghommie's fix.
2019-08-09 12:17:54 +01:00
Poojawa
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
