Commit Graph

6028 Commits

Author SHA1 Message Date
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
silicons 7c07863179 fix 2020-10-05 13:29:53 -07:00
Timothy Teakettle 05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
silicons 2e557b2f26 Update simple_animal.dm 2020-10-03 19:51:20 -07:00
silicons 7586c38d52 Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
Timothy Teakettle 46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01:00
Timothy Teakettle b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
timothyteakettle dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle 0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
silicons d5ff552f3e Merge pull request #13494 from monster860/patch-4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-03 14:22:11 -07:00
silicons 0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
silicons 3e6428567a Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
zerothebigboy 0b8f311e65 a 2020-10-03 03:47:27 -04:00
Putnam 737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -07:00
Zandario 1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00
Maxim Nikitin 4b6870ed1b the fuck 2020-10-02 12:07:09 -04:00
Maxim Nikitin 64b4abca4b oopsie 2020-10-02 12:05:05 -04:00
Maxim Nikitin 96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
timothyteakettle 6533d850c2 compile 2020-10-02 16:42:06 +01:00
timothyteakettle ab83185ffc oh no 2020-10-02 16:40:34 +01:00
timothyteakettle 418cd44bbe SQUISH 2020-10-02 16:31:33 +01:00
timothyteakettle 950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
timothyteakettle 32f32d7e62 compile 2020-10-02 02:33:33 +01:00
timothyteakettle 3fc016e19d better movement 2020-10-02 02:32:10 +01:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
timothyteakettle 26cfac8988 brrr 2020-10-01 23:57:01 +01:00
timothyteakettle eb31434b7b final fix 2020-10-01 23:54:50 +01:00
timothyteakettle 13f1b59133 typo 2020-10-01 23:41:54 +01:00
timothyteakettle 203246ece7 FUCK 2020-10-01 23:40:57 +01:00
timothyteakettle c602ad1cab yes 2020-10-01 23:13:53 +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
timothyteakettle 121ec996cf fuck it no resting 2020-10-01 23:09:20 +01:00
Timothy Teakettle 03ad9eb052 experimental test 2020-10-01 22:51:40 +01:00
Timothy Teakettle b73770c3bc fuck 2020-10-01 22:03:15 +01:00
Timothy Teakettle 57733473fe TRAIT SOURCE DEFINE 2020-10-01 21:23:17 +01:00
Timothy Teakettle cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy Teakettle 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Tupinambis 5d4429a61a You can now have none 2020-10-01 12:57:07 -05:00
Timothy Teakettle e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire 173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02: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 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -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
Ghom 7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
Putnam3145 22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix
Fixes angels not being fast while flying
2020-10-01 02:40:18 -07:00
Tupinambis b60e22eaba Fragility. 2020-09-30 19:39:54 -05:00