fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05: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
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05:00
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -05:00
0ac3a2307d
Update wings.dm
2019-09-11 17:48:57 -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
a0decbfd91
Human magic revival does bleeding heal
2019-09-11 04:37:46 -05:00
6353bd1064
Cult heals do bleed stopping
...
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
88b48ca387
hard caps bleeding rate to 20
2019-09-11 02:37:48 -05:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
11846849cf
Merge pull request #9249 from Trilbyspaceclone/patch-224
...
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
8c05b4a1d8
*poor cleanbot*
2019-09-06 19:20:32 -04:00
3c38e6eb3d
Update cleanbot.dm
2019-09-06 18:49:42 -04:00
3e5a192af0
Updates borg examine to also show what module type they are.
2019-09-06 13:31:01 +12:00
cca2001ccb
Fixes dogborgs not using their deadsprite
2019-09-06 12:29:36 +12: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
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
e943cf0ae8
Merge pull request #9219 from Trilbyspaceclone/patch-219
...
Ports "Fixes slimes not feeding #44760 "
2019-08-31 02:09:15 -05:00
9c9e1b1da3
Update life.dm
2019-08-30 09:24:58 -04:00
6b5388951f
Ohwait let's not return on a normal process. :^)
2019-08-30 03:16:18 -05:00
2849f82d0b
let's be sure people don't have negative bleeding, because that would be weird as fuck.
2019-08-30 03:15:46 -05:00
931527ff7c
Update mob.dm
2019-08-29 22:54:41 -07:00
dca90db321
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-29 23:03:26 -05:00
36a07f134b
Merge pull request #9208 from Ghommie/Ghommie-cit190
...
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
bea4349056
Merge pull request #9180 from deathride58/buffspoly
...
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
2019-08-27 20:50:59 -07:00
0ffeb704af
Socks color fix.
2019-08-28 05:33:36 +02:00
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
fd16520ac0
buffs toxinlover blood deletion penalty
2019-08-27 02:42:45 -05:00
f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
d7ec568efc
Allows xeno weeds to regenerate lost blood
...
Honestly this should have been a thing since forever ago but whatever.
2019-08-26 09:08:00 -05:00
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -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
d60ba0a207
Fixes missing DNA info for slimes, resolves virology issues
2019-08-24 04:14:47 -05:00
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
b29607c019
It's working again, I guess. wtf
2019-08-21 01:36:59 -05:00
Poojawa