cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162 from Markolie/master

Browse Source 
Changeling DNA fixes
This commit is contained in:
Fox-McCloud
2015-01-13 17:05:41 -05:00
parent e8fde6a655 b168f7f766
commit 02858f3406
8 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+11
View File
@@ -1338,6 +1338,17 @@
spawn(0)
update_icons()
if(species && species.flags & NO_BLOOD) //We want the var for safety but we can do without the actual blood.
if(vessel.has_reagent("water") || vessel.has_reagent("blood"))
var/water = vessel.get_reagent_amount("water")
var/blood = vessel.get_reagent_amount("blood")
vessel.remove_reagent("water",water)
vessel.remove_reagent("blood",blood)
if(species.bloodflags & BLOOD_SLIME)
vessel.add_reagent("water",560-vessel.total_volume)
else
vessel.add_reagent("blood",560-vessel.total_volume)
fixblood()
if(species)
return 1
code/modules/organs/blood.dm
+7 -3
View File
@@ -19,9 +19,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
vessel = new/datum/reagents(600)
vessel.my_atom = src
if(species && species.flags & NO_BLOOD) //We want the var for safety but we can do without the actual blood.
return
if(species.bloodflags &BLOOD_SLIME)
if(species && species.flags & NO_BLOOD) //In case of transformation to IPC
if(vessel.has_reagent("water") || vessel.has_reagent("blood"))
var/water = vessel.get_reagent_amount("water")
var/blood = vessel.get_reagent_amount("blood")
vessel.remove_reagent("water",water)
vessel.remove_reagent("blood",blood)
if(species.bloodflags & BLOOD_SLIME)
vessel.add_reagent("water",560)
else
vessel.add_reagent("blood",560)
code/modules/research/designs/power_designs.dm
+1 -1
View File
@@ -45,7 +45,7 @@
category = list("Misc","Power")
/datum/design/pacman
name = "Machien Board (PACMAN-type Generator)"
name = "Machine Board (PACMAN-type Generator)"
desc = "The circuit board that for a PACMAN-type portable generator."
id = "pacman"
req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3)