cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2

Browse Source
This commit is contained in:
DeltaFire
2020-10-11 00:47:54 +02:00
parent 73b5267425 5d97b04a6f
commit c5bb85d794
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/surgery/bodyparts/dismemberment.dm
View File

@@ -434,7 +434,7 @@
var/datum/scar/scaries = new var/datum/scar/scaries = new
var/datum/wound/loss/phantom_loss = new // stolen valor, really var/datum/wound/loss/phantom_loss = new // stolen valor, really
scaries.generate(L, phantom_loss) scaries.generate(L, phantom_loss)
if(HAS_TRAIT(src, ROBOTIC_LIMBS)) //Snowflake trait moment, but needed.
L.change_bodypart_status(BODYPART_HYBRID, FALSE, TRUE) //Haha what if IPC-lings actually regenerated the right limbs instead of organic ones? That'd be pretty cool, right?
L.attach_limb(src, 1) L.attach_limb(src, 1)
if(ROBOTIC_LIMBS in dna.species.species_traits) //Snowflake trait moment, but needed.
L.change_bodypart_status(BODYPART_HYBRID, FALSE, TRUE) //Haha what if IPC-lings actually regenerated the right limbs instead of organic ones? That'd be pretty cool, right?
return TRUE return TRUE

4
html/changelogs/AutoChangeLog-pr-13531.yml Normal file
View File

@@ -0,0 +1,4 @@
author: "DeltaFire15"
delete-after: True
changes:
- bugfix: "A certain lizard (totally not me) being stupid is no longer going to break regenerate_bodyparts"