cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8791 from Rykka-Stormheart/shep-dev-span-fix

Browse Source 
Fix Merge Conflict in #8755
This commit is contained in:
Verkister
2020-08-21 15:09:04 +03:00
committed by GitHub
parent cf491a56b7 56ee47720b
commit 4b95faeced
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_helpers.dm
-3
View File
@@ -102,11 +102,8 @@
var/obj/item/organ/external/T = organs_by_name[BP_TORSO]
if(T && T.robotic >= ORGAN_ROBOT)
src.verbs += /mob/living/carbon/human/proc/self_diagnostics
<<<<<<< HEAD
src.verbs += /mob/living/carbon/human/proc/reagent_purge //VOREStation Add
=======
src.verbs += /mob/living/carbon/human/proc/setmonitor_state
>>>>>>> 42e2305... Gives FBP's a proc to change their monitor display without using a mask item. (#7452)
var/datum/robolimb/R = all_robolimbs[T.model]
synthetic = R
return synthetic