cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG fixes - Fix transformation burger and powersink fucking up fully charged APCs

Browse Source
This commit is contained in:
clusterfack
2014-12-27 12:38:43 -06:00
parent 3721987494
commit f84c54ac9f
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/diseases/robotic_transformation.dm
View File

@@ -55,11 +55,9 @@
if(src.gibbed != 0) return 0 if(src.gibbed != 0) return 0
var/turf/T = find_loc(affected_mob) var/turf/T = find_loc(affected_mob)
gibs(T) gibs(T)
src.cure(0)
gibbed = 1 gibbed = 1
var/mob/living/carbon/human/H = affected_mob var/mob/living/carbon/human/H = affected_mob
if(istype(H) && !jobban_isbanned(affected_mob, "Cyborg")) if(istype(H) && !jobban_isbanned(affected_mob, "Cyborg"))
H.Robotize() H.Robotize()
else else
affected_mob.death(1) affected_mob.death(1)

1
code/datums/diseases/xeno_transformation.dm
View File

@@ -55,7 +55,6 @@
if(gibbed != 0) return 0 if(gibbed != 0) return 0
var/turf/T = find_loc(affected_mob) var/turf/T = find_loc(affected_mob)
gibs(T) gibs(T)
src.cure(0)
gibbed = 1 gibbed = 1
affected_mob:Alienize() affected_mob:Alienize()

2
code/game/objects/items/devices/powersink.dm
View File

@@ -121,6 +121,8 @@
if(A.operating && A.cell) if(A.operating && A.cell)
A.cell.charge = max(0, A.cell.charge - 50) A.cell.charge = max(0, A.cell.charge - 50)
power_drained += 50 power_drained += 50
if(A.charging == 2)
A.charging = 1
if(power_drained > max_power * 0.95) if(power_drained > max_power * 0.95)