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-12 02:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for missing DNA strings

Browse Source
This commit is contained in:
TalkingCactus
2016-08-23 22:17:15 -04:00
parent 3355240010
commit 09d4ee3313
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/effects/decals/Cleanable/aliens.dm
View File

@@ -10,7 +10,7 @@
icon_state = "xfloor1" icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7") random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
var/list/viruses = list() var/list/viruses = list()
blood_DNA = list() blood_DNA = list("UNKNOWN DNA" = "X")
bloodiness = MAX_SHOE_BLOODINESS bloodiness = MAX_SHOE_BLOODINESS
blood_state = BLOOD_STATE_XENO blood_state = BLOOD_STATE_XENO
@@ -76,7 +76,7 @@
/obj/effect/decal/cleanable/blood/xtracks /obj/effect/decal/cleanable/blood/xtracks
icon_state = "xtracks" icon_state = "xtracks"
random_icon_states = null random_icon_states = null
blood_DNA = list("UNKNOWN DNA" = "X*") blood_DNA = list("UNKNOWN DNA" = "X")
/obj/effect/decal/cleanable/xdrip /obj/effect/decal/cleanable/xdrip
name = "drips of blood" name = "drips of blood"
@@ -87,7 +87,7 @@
random_icon_states = list("xdrip1","xdrip2","xdrip3","xdrip4","xdrip5") random_icon_states = list("xdrip1","xdrip2","xdrip3","xdrip4","xdrip5")
bloodiness = 0 bloodiness = 0
var/drips = 1 var/drips = 1
blood_DNA = list() blood_DNA = list("UNKNOWN DNA" = "X")
/obj/effect/decal/cleanable/xdrip/can_bloodcrawl_in() /obj/effect/decal/cleanable/xdrip/can_bloodcrawl_in()
return 1 return 1

9
code/modules/mob/living/carbon/human/species_types.dm
View File

@@ -1134,6 +1134,8 @@ datum/species/canid
roundstart = 0 //wip roundstart = 0 //wip
blacklisted = 1 blacklisted = 1
no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
skinned_type = /obj/item/stack/sheet/animalhide/xeno
/datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species) /datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species)
var/obj/effect/decal/cleanable/xenoblood/xgibs/XG var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
@@ -1141,6 +1143,13 @@ datum/species/canid
return return
else else
C.gib_type = XG C.gib_type = XG
/datum/species/xeno/on_species_loss(mob/living/carbon/C)
var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
var/obj/effect/decal/cleanable/blood/gibs/HG
if(istype(C.gib_type, XG))
C.gib_type = HG
else
return
/datum/reagent/toxin/acid/xenoblood /datum/reagent/toxin/acid/xenoblood
name = "acid blood" name = "acid blood"