Poojawa
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
Fermi
8dcf74d5f0
Makes buffers not react with stab agent
2019-09-22 12:02:20 +01:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
kevinz000
313956002b
Merge pull request #9269 from Thalpy/FermiGrenades
...
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a
Merge pull request #9282 from Ghommie/Ghommie-cit193
...
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
Fermi
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
Poojawa
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
Poojawa
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -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
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
TrilbySpaceClone
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
Ghommie
2226bd3b69
More adjustments.
2019-09-13 00:25:52 +02:00
Poojawa
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -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
Thalpy
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
Fermi
4f0afb6e45
50 to 100
2019-09-10 21:36:49 +01:00
Fermi
0a4090d83c
Fixes weird message
2019-09-10 21:12:43 +01:00
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
Fermi
033057d380
OOPS
2019-09-08 02:55:40 +01: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
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
Fermi
85fc947dd7
Allows furranium grown from organic sources.
2019-08-30 20:44:39 +01:00
Fermi
77eef5de6f
Heat plays a component now.
2019-08-30 20:42:22 +01:00
Poojawa
dca90db321
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-29 23:03:26 -05: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
Fermi
124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01: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
deathride58
1376791e7a
fixes the poly tgs command not working at all
2019-08-22 20:13:56 -04:00
Poojawa
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
Poojawa
a0308a2760
Enables Poly phrases on tgs commands
2019-08-18 08:29:28 -05:00
Poojawa
569e33fdbc
Update human.dm
2019-08-17 05:55:47 -05:00
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
Poojawa
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -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
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05: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
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