shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blood dna is fixed, your ERP code is too

Browse Source
This commit is contained in:
Poojawa
2019-08-20 07:41:50 -05:00
parent 96834bc517
commit bda3ac8745
8 changed files with 112 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
-1
View File
@@ -217,7 +217,6 @@
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
skinned_type = /obj/item/stack/sheet/animalhide/xeno
exotic_blood = "xenoblood"
exotic_bloodtype = "X*"
damage_overlay_type = "xeno"
liked_food = MEAT
modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
-2
View File
@@ -13,8 +13,6 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
mutanttongue = /obj/item/organ/tongue/robot/ipc
mutant_heart = /obj/item/organ/heart/ipc
exotic_blood = "oilblood"
exotic_bloodtype = "HF"
var/datum/action/innate/monitor_change/screen
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+2 -2
View File
@@ -299,10 +299,10 @@
//So slimes can play too.
/datum/chemical_reaction/fermi/enthrall/slime
required_catalysts = list("slimejelly" = 1)
required_catalysts = list("jellyblood" = 1)
/datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
var/datum/reagent/toxin/slimejelly/B = locate(/datum/reagent/toxin/slimejelly) in my_atom.reagents.reagent_list//The one line change.
var/datum/reagent/blood/jellyblood/B = locate(/datum/reagent/blood/jellyblood) in my_atom.reagents.reagent_list//The one line change.
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
if(!B.data)
var/list/seen = viewers(5, get_turf(my_atom))