641196b9dd
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-19 19:57:57 +01:00
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01: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
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01: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
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05: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
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
63d2273a75
Merge pull request #9220 from Thalpy/Catnip-Furranium
...
Allows Furranium grown from organic sources.
2019-09-13 10:41:07 -07: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
2226bd3b69
More adjustments.
2019-09-13 00:25:52 +02:00
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05: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
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
b22994e546
Removes MK stuffs
2019-09-10 21:59:24 +01:00
4f0afb6e45
50 to 100
2019-09-10 21:36:49 +01:00
0a4090d83c
Fixes weird message
2019-09-10 21:12:43 +01:00
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
12626c8db2
Okay I dunno why it does what it do but it do.
2019-09-10 20:51:22 +01:00
621851790e
Damnit hat, don't get too excited now, y'all.
2019-09-10 20:46:38 +01:00
443f9e433d
Final tweaks
2019-09-10 20:18:45 +01:00
f03c9c236d
Compile fixes and tweaks.
2019-09-10 18:54:47 +01:00
8b20df838d
Just testing now.
2019-09-10 18:15:04 +01:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
de055fe289
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
...
[Consider speedmerging] Fixes the infinite clone problem.
2019-09-08 19:46:08 -04:00
033057d380
OOPS
2019-09-08 02:55:40 +01:00
d883192cf9
Forgot to save
2019-09-08 02:53:11 +01:00
2a98f94b24
Rewrite
2019-09-08 02:52:22 +01:00
018ebc32ae
All that remains is MK testing.
2019-09-08 02:46:43 +01: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
d90b4769f1
MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes.
2019-09-05 22:30:53 +01:00
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
f1f762ef48
Darnit bobby
2019-09-04 21:45:55 +01:00
91cace6812
Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks
2019-09-03 20:33:33 +01:00
7890ad08d5
what is this
2019-09-03 20:30:21 +01:00
a605d2a776
Todo: finish new words and review langauge
2019-09-03 20:16:41 +01:00
67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
Thalpy