DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02: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
21c85de81d
oops!
2020-10-06 18:28:31 +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
Timothy Teakettle
710ab0ffa6
Update eyes.dm
2020-10-01 22:06:03 +01:00
Timothy Teakettle
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
Timothy Teakettle
14e217082f
compile
2020-10-01 20:51:53 +01:00
silicons
d8e58b1c48
Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
...
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07: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
silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Timothy Teakettle
16735e0190
silent paralysis
2020-09-30 21:40:42 +01:00
Tupinambis
d2500fe389
Adds Methane and Methyl Bromide
2020-09-27 15:15:58 -05:00
Timothy Teakettle
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Timothy Teakettle
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01: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
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
silicons
a668251de6
Merge pull request #13353 from timothyteakettle/accent-tidyup
...
further accent modifications because holy shit
2020-09-08 10:31:45 -07:00
BlackMajor
1f96766699
Merge pull request #13273 from Citadel-Station-13/silicons-patch-2
...
slightly more intuitive eyebeam clamping
2020-09-08 12:05:10 +12:00
Timothy Teakettle
98a7332e23
is this really the root of the issue
2020-09-06 21:02:24 +01:00
Timothy Teakettle
8fe55e1317
travis what the fuck
2020-09-06 19:16:30 +01:00
Timothy Teakettle
d51fb00ebf
makes more sense this way
2020-09-06 18:57:17 +01:00
Timothy Teakettle
5f5455add1
yes
2020-09-06 18:48:59 +01:00
BlackMajor
fb531e88d8
Merge pull request #13073 from Citadel-Station-13/silicons-patch-84
...
you can no longer attack people with surgical tools if you are in help intent
2020-09-06 17:49:35 +12:00
Timothy Teakettle
de640254c7
tidyup
2020-09-05 20:32:22 +01:00
Putnam3145
d6127d71a8
Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time
...
lets ipcs talk but i actually push my changes this time
2020-09-05 08:40:31 -07:00
Timothy Teakettle
c690e59085
change accent names
2020-09-05 16:26:55 +01:00
silicons
84734591ed
Merge pull request #13268 from timothyteakettle/accents
...
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
Timothy Teakettle
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
silicons
857c581931
Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
...
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
silicons
cf85d68ec2
Update eyes.dm
2020-08-27 09:39:27 -07:00
silicons
0351686399
Update eyes.dm
2020-08-27 09:38:39 -07:00
timothyteakettle
8d6a026153
yep
2020-08-27 00:01:54 +01:00
silicons
c264d90140
Update eyes.dm ( #13254 )
2020-08-26 18:00:27 +02:00
timothyteakettle
29ce240903
yes
2020-08-21 23:17:40 +01:00
timothyteakettle
a75d91299a
yep
2020-08-21 23:16:44 +01:00
Timothy Teakettle
b953622e6f
FUCK
2020-08-21 22:14:50 +01:00
