Poojawa
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
kevinz000 and GitHub
46994f2475
Merge pull request #9448 from MrJWhit/zombie-eyes
...
Makes zombie smell through their eyes
2019-10-11 12:16:06 -07:00
kevinz000 and GitHub
b0b274762c
Merge pull request #9441 from lolman360/whydowehave1000branches
...
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
lolman360
c694cb8652
h
2019-10-09 13:35:23 +11:00
Poojawa
26e35376d6
ok
2019-10-08 15:15:56 -05:00
MrJWhit
2629402fa4
Makes zombie smell through their eyes
...
Gives zombie eyes the SEE_MOBS flag, the same as xenos, to let them "smell" living flesh.
2019-10-08 14:53:00 -04:00
lolman360
5cc16011ac
paren
2019-10-08 20:13:44 +11:00
lolman360
ddb781a144
examines
2019-10-08 20:09:07 +11:00
lolman360
2709570f01
techwebs and stuff i forgot
...
i am not a 1 commit wonder
2019-10-08 20:02:26 +11:00
lolman360
04521551f0
one commit wonder
2019-10-08 19:46:28 +11:00
Poojawa
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
and Fermi
391af0f946
I have no idea why the brain doesn't decay, but this seems to fix it.
2019-09-28 07:26:59 +01:00
and Fermi
b622ea4fd2
Fixes
2019-09-27 13:49:25 +01:00
and Fermi
b16e697201
eye tweaks.
2019-09-27 13:34:27 +01:00
and Fermi
50ef6aa257
Eye fix
2019-09-27 13:28:23 +01:00
and Fermi
a6a1449951
This was supposed to be the atomised branch aaargh!!
2019-09-27 11:44:15 +01:00
and Fermi
e11197f977
Truth
2019-09-27 11:23:06 +01:00
and Fermi
888906b4e7
Fixes Mk1 !
2019-09-27 11:12:53 +01:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
and Fermi
167ffde648
OOPS
2019-09-21 14:07:23 +01:00
and Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
and Fermi
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
and Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
kevinz000 and GitHub
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
and Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
and Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
and Fermi
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
and Fermi
b9a2a5ce38
Oops
2019-09-19 15:41:26 +01:00
and Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
Linzolle
573932437e
COMMA
2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe
display results and wording
2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84
citadel fixes
2019-09-18 23:15:05 -05:00
XDTM and Linzolle
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
XDTM and Linzolle
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05:00
and Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
and Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
and Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
and Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +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
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -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
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
TrilbySpaceClone
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
Poojawa
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
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
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -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
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
Poojawa