cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3263 from VOREStation/aro-recharge

Browse Source 
Make borg recharger test more robust + FBP Cells
This commit is contained in:
Leshana
2018-03-17 20:10:31 -04:00
committed by GitHub
parent 946b5c7110 299f6e4299
commit 835a8b4acb
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/rechargestation.dm
+1 -1
View File
@@ -254,7 +254,7 @@
else if(istype(L, /mob/living/carbon/human))
var/mob/living/carbon/human/H = L
if(!isnull(H.internal_organs_by_name["cell"]))
if(H.isSynthetic())
add_fingerprint(H)
H.reset_view(src)
H.forceMove(src)
code/modules/organs/organ_external_vr.dm
+15
View File
@@ -0,0 +1,15 @@
//Sideways override for nanoform limbs (ugh)
/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
var/original_robotic = robotic
if(original_robotic >= ORGAN_NANOFORM)
var/o_encased = encased
var/o_max_damage = max_damage
var/o_min_broken_damage = min_broken_damage
robotic = FALSE
. = ..(company = company, keep_organs = TRUE)
robotic = original_robotic
encased = o_encased
max_damage = o_max_damage
min_broken_damage = o_min_broken_damage
else
return ..()
code/modules/organs/subtypes/nano.dm
-16
View File
@@ -66,22 +66,6 @@
min_broken_damage = 1000
vital = FALSE
//Sideways override for nanoform limbs (ugh)
/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
var/original_robotic = robotic
if(original_robotic >= ORGAN_NANOFORM)
var/o_encased = encased
var/o_max_damage = max_damage
var/o_min_broken_damage = min_broken_damage
robotic = FALSE
..(company = company, keep_organs = TRUE)
robotic = original_robotic
encased = o_encased
max_damage = o_max_damage
min_broken_damage = o_min_broken_damage
else
..()
// // // Internal Organs
/obj/item/organ/internal/nano
robotic = ORGAN_ROBOT
code/modules/organs/subtypes/standard.dm
+1 -1
View File
@@ -24,7 +24,7 @@
base_miss_chance = 10
/obj/item/organ/external/chest/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0)
if(..())
if(..() && robotic != ORGAN_NANOFORM) //VOREStation Edit
// Give them a new cell.
owner.internal_organs_by_name["cell"] = new /obj/item/organ/internal/cell(owner,1)
vorestation.dme
+1
View File
@@ -2261,6 +2261,7 @@
#include "code\modules\organs\misc.dm"
#include "code\modules\organs\organ.dm"
#include "code\modules\organs\organ_external.dm"
#include "code\modules\organs\organ_external_vr.dm"
#include "code\modules\organs\organ_icon.dm"
#include "code\modules\organs\organ_stump.dm"
#include "code\modules\organs\pain.dm"