mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-24 20:46:29 +01:00
Non-whitelisted IPCS
Had to do a hacky fix. there was no real way around it. Also, a couple balances with IPCs And a totally silly death animation (Which has been commented out for now)
This commit is contained in:
@@ -37,8 +37,9 @@
|
||||
..()
|
||||
|
||||
/mob/living/carbon/human/machine/New()
|
||||
species = new /datum/species/machine(src)
|
||||
h_style = "blue IPC screen"
|
||||
set_species("Machine")
|
||||
..()
|
||||
|
||||
/mob/living/carbon/human/New()
|
||||
|
||||
|
||||
@@ -1072,7 +1072,7 @@
|
||||
E = get_visible_implants(0)
|
||||
if(!E.len)
|
||||
embedded_flag = 0
|
||||
|
||||
|
||||
|
||||
//Eyes
|
||||
if(sdisabilities & BLIND) //disabled-blind, doesn't get better on its own
|
||||
@@ -1296,7 +1296,7 @@
|
||||
if(2) healths.icon_state = "health7"
|
||||
else
|
||||
//switch(health - halloss)
|
||||
switch(100 - ((species && species.flags & NO_PAIN) ? 0 : traumatic_shock))
|
||||
switch(100 - ((species && species.flags & NO_PAIN & !IS_SYNTHETIC) ? 0 : traumatic_shock))
|
||||
if(100 to INFINITY) healths.icon_state = "health0"
|
||||
if(80 to 100) healths.icon_state = "health1"
|
||||
if(60 to 80) healths.icon_state = "health2"
|
||||
|
||||
@@ -53,6 +53,13 @@
|
||||
return
|
||||
|
||||
/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
|
||||
if(flags & IS_SYNTHETIC)
|
||||
//H.make_jittery(200) //S-s-s-s-sytem f-f-ai-i-i-i-i-lure-ure-ure-ure
|
||||
H.h_style = ""
|
||||
spawn(100)
|
||||
//H.is_jittery = 0
|
||||
//H.jitteriness = 0
|
||||
H.update_hair()
|
||||
return
|
||||
|
||||
/datum/species/human
|
||||
@@ -219,8 +226,8 @@
|
||||
punch_damage = 2
|
||||
|
||||
eyes = "blank_eyes"
|
||||
brute_mod = 1.5
|
||||
burn_mod = 1.5
|
||||
brute_mod = 0.5
|
||||
burn_mod = 1
|
||||
|
||||
warning_low_pressure = 50
|
||||
hazard_low_pressure = 10
|
||||
@@ -233,7 +240,7 @@
|
||||
heat_level_2 = 3000
|
||||
heat_level_3 = 4000
|
||||
|
||||
flags = NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
|
||||
flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
|
||||
|
||||
blood_color = "#FFFFFF"
|
||||
flesh_color = "#AAAAAA"
|
||||
blood_color = "#1F181F"
|
||||
flesh_color = "#575757"
|
||||
|
||||
Reference in New Issue
Block a user