SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
DeltaFire
6192d4ddab
fixes
2021-01-13 00:08:59 +01:00
uomo91
6b0435e7b5
Port.
2021-01-01 00:46:47 -06:00
Timothy Teakettle
2ca997e339
fix
2020-12-21 20:19:26 +00:00
silicons
c7396632db
Merge pull request #13582 from timothyteakettle/i-hate-mcolor
...
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
silicons
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
Timothy Teakettle
b6aa8c352e
remove message
2020-11-08 16:50:09 +00:00
Timothy Teakettle
185939a09f
stable version
2020-11-08 16:49:49 +00:00
Timothy Teakettle
d358a170fa
fixes
2020-11-08 14:32:10 +00:00
Timothy Teakettle
48ecffa8f4
Revert "Revert "fixes""
...
This reverts commit 2fb9dc88e7
2020-11-08 12:48:00 +00:00
Timothy Teakettle
2fb9dc88e7
Revert "fixes"
...
This reverts commit a7e0bafde3
2020-11-08 02:23:55 +00:00
Timothy Teakettle
a7e0bafde3
fixes
2020-11-08 01:46:43 +00:00
Timothy Teakettle
022f996cfa
better fix
2020-11-05 17:28:32 +00:00
timothyteakettle
8126eb5a12
fixes a lot of things
2020-11-02 23:07:27 +00:00
Timothy Teakettle
22823f629d
an actual fix
2020-11-01 20:40:08 +00:00
Timothy Teakettle
e78383f4fa
typo
2020-10-30 19:42:02 +00:00
Timothy Teakettle
f4f322dd0e
better fix
2020-10-30 19:39:43 +00:00
silicons
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
Tupinambis
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
DeltaFire
8895560c4b
tweaks threshholds a bit
...
modifies the advanced prosthetics threshhold a bit:
25 > 20, still 5 mindamage.
2020-10-11 16:57:15 +02:00
DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
c5bb85d794
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 00:47:54 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
Putnam3145
4f5f56e68f
Merge pull request #13531 from DeltaFire15/quick-fix
...
Oops! Regenerate_bodyparts-edition
2020-10-10 15:33:59 -07:00
DeltaFire
641970f2c0
fixes two typos
...
yeah, I got those two wrong. Not anymore though.
2020-10-10 16:48:25 +02:00
Timothy Teakettle
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
DeltaFire
0d299684ed
oops!
2020-10-06 21:35:08 +02:00
DeltaFire
2cdabc039e
Aaand now for the bodyparts
...
Title. Robo bodyparts now each have their own custom threshholds
Surplus prothetic: just bad. Very.
Cyborg: High tolerance until threshhold, but can't be well repaired once past those
Advanced Prosthetic: Relatively low threshhold, but not impacted too hard from the threshhold being passed.
2020-10-06 18:14:54 +02:00
DeltaFire
06cb91ca3d
updates all BODYPART_ORGANIC occurances
...
:)
2020-10-06 18:01:25 +02:00
DeltaFire
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
Timothy Teakettle
b48f4b91e6
Merge branch 'master' into eye-sprites
2020-10-04 01:23:03 +01:00
Timothy Teakettle
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
silicons
6094cd7191
Merge pull request #13508 from DeltaFire15/robotic-fixes
...
bodypart fixes - robotic bodypart & digitigrade edition
2020-10-03 14:32:45 -07:00
DeltaFire
c2e6fcb172
modifies regenerate_limbs()
...
This allows it to work for people with the ROBOTIC_LIMBS trait, creating robotic (/ synthetic, or whatever the hell those are considering they're inbetween) limbs for them instead of organic ones
2020-10-03 22:46:01 +02:00
DeltaFire
79af981467
fixes some fun limb code
2020-10-03 21:51:49 +02:00
timothyteakettle
950cb05617
Merge remote-tracking branch 'upstream/master' into slime-puddle
2020-10-02 15:53:48 +01:00
timothyteakettle
158b1d584f
woopsy
2020-10-02 14:54:57 +01:00
timothyteakettle
3ba9031fe2
Revert "gender part support"
...
This reverts commit 358041c2ef
2020-10-02 14:54:05 +01:00
timothyteakettle
358041c2ef
gender part support
2020-10-02 14:50:42 +01:00
Tupinambis
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
Timothy Teakettle
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
silicons
b7650f3dea
Merge pull request #13398 from timothyteakettle/wound-config
...
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
Timothy Teakettle
16735e0190
silent paralysis
2020-09-30 21:40:42 +01:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
timothyteakettle
c3bea5f77b
wounds
2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32
config
2020-09-15 23:20:11 +01:00
