cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-17 10:58:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from ArchieBeepBoop/gibspawner

Browse Source 
Mass Merge - The Blood System Rework & A metric fuckton of runtime fixes
This commit is contained in:
Dahlular
2020-10-23 16:20:26 -06:00
committed by GitHub
parent 9d1c810742 feaa0ecd24
commit 0719169693
143 changed files with 2127 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/carbon/human/human.dm
-15
View File
@@ -1,18 +1,3 @@
/mob/living/carbon/human/species/mammal
race = /datum/species/mammal
/mob/living/carbon/human/species/avian
race = /datum/species/avian
/mob/living/carbon/human/species/aquatic
race = /datum/species/aquatic
/mob/living/carbon/human/species/insect
race = /datum/species/insect
/mob/living/carbon/human/species/xeno
race = /datum/species/xeno
/mob/living/proc/resist_embedded()
return
modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+2 -1
View File
@@ -221,8 +221,9 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless)
skinned_type = /obj/item/stack/sheet/animalhide/xeno
exotic_bloodtype = "L"
exotic_bloodtype = "X*"
damage_overlay_type = "xeno"
liked_food = MEAT
modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
+5 -5
View File
@@ -1,5 +1,5 @@
/datum/species/ipc
name = "I.P.C"
name = "I.P.C."
id = "ipc"
say_mod = "beeps"
default_color = "00FF00"
@@ -10,16 +10,16 @@
inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
mutant_bodyparts = list("ipc_screen", "ipc_antenna")
default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
meat = null //robots can't make meat silly!
//Just robo looking parts.
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
mutanttongue = /obj/item/organ/tongue/robot/ipc
mutant_heart = /obj/item/organ/heart/ipc
mutantlungs = /obj/item/organ/lungs/ipc
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
mutanttongue = /obj/item/organ/tongue/robot
exotic_bloodtype = "oil"
exotic_bloodtype = "HF"
var/datum/action/innate/monitor_change/screen
modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+1 -1
View File
@@ -8,7 +8,7 @@
id = "slimeperson"
limbs_id = "slime"
default_color = "00FFFF"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD,WINGCOLOR)
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR)
inherent_traits = list(TRAIT_TOXINLOVER)
mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "deco_wings")
default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None")