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

Merge pull request #3417 from Fox-McCloud/spoopy

Browse Source 
Adds in Skeleton Race
This commit is contained in:
TheDZD
2016-01-28 16:02:18 -05:00
parent a38a3a0165 243fae96c6
commit 3c35269615
20 changed files with 134 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -95,9 +95,9 @@
h_style = "Bald"
..(new_loc, "Vox Armalis")
/mob/living/carbon/human/skellington/New(var/new_loc)
/mob/living/carbon/human/skeleton/New(var/new_loc)
h_style = "Bald"
..(new_loc, "Skellington")
..(new_loc, "Skeleton")
/mob/living/carbon/human/kidan/New(var/new_loc)
..(new_loc, "Kidan")
code/modules/mob/living/carbon/human/human_damage.dm
+1 -1
View File
@@ -142,7 +142,7 @@
/mob/living/carbon/human/adjustCloneLoss(var/amount)
..()
if(species.flags & (NO_DNA_RAD))
if(species.flags & (NO_DNA))
cloneloss = 0
return
code/modules/mob/living/carbon/human/life.dm
+71 -70
View File
@@ -213,85 +213,86 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
speech_problem_flag = 1
gene.OnMobLife(src)
if (radiation)
if(!(species.flags & RADIMMUNE))
if (radiation)
if((locate(src.internal_organs_by_name["resonant crystal"]) in src.internal_organs))
var/rads = radiation/25
radiation -= rads
radiation -= 0.1
reagents.add_reagent("radium", rads/10)
if( prob(10) )
src << "<span class='notice'>You feel relaxed.</span>"
return
if (radiation > 100)
radiation = 100
if(!(species.flags & RAD_ABSORB))
Weaken(10)
if(!lying)
src << "<span class='alert'>You feel weak.</span>"
emote("collapse")
if (radiation < 0)
radiation = 0
else
if(species.flags & RAD_ABSORB)
if((locate(src.internal_organs_by_name["resonant crystal"]) in src.internal_organs))
var/rads = radiation/25
radiation -= rads
nutrition += rads
adjustBruteLoss(-(rads))
adjustOxyLoss(-(rads))
adjustToxLoss(-(rads))
updatehealth()
radiation -= 0.1
reagents.add_reagent("radium", rads/10)
if( prob(10) )
src << "<span class='notice'>You feel relaxed.</span>"
return
var/damage = 0
switch(radiation)
if(0 to 49)
radiation--
if(prob(25))
adjustToxLoss(1)
if (radiation > 100)
radiation = 100
if(!(species.flags & RAD_ABSORB))
Weaken(10)
if(!lying)
src << "<span class='alert'>You feel weak.</span>"
emote("collapse")
if (radiation < 0)
radiation = 0
else
if(species.flags & RAD_ABSORB)
var/rads = radiation/25
radiation -= rads
nutrition += rads
adjustBruteLoss(-(rads))
adjustOxyLoss(-(rads))
adjustToxLoss(-(rads))
updatehealth()
return
var/damage = 0
switch(radiation)
if(0 to 49)
radiation--
if(prob(25))
adjustToxLoss(1)
damage = 1
updatehealth()
if(50 to 74)
radiation -= 2
damage = 1
adjustToxLoss(1)
if(prob(5))
radiation -= 5
Weaken(3)
if(!lying)
src << "<span class='alert'>You feel weak.</span>"
emote("collapse")
updatehealth()
if(50 to 74)
radiation -= 2
damage = 1
adjustToxLoss(1)
if(prob(5))
if(75 to 100)
radiation -= 3
adjustToxLoss(3)
damage = 3
if(prob(1))
src << "<span class='alert'>You mutate!</span>"
randmutb(src)
domutcheck(src,null)
emote("gasp")
updatehealth()
else
radiation -= 5
Weaken(3)
if(!lying)
src << "<span class='alert'>You feel weak.</span>"
emote("collapse")
updatehealth()
adjustToxLoss(5)
damage = 5
if(prob(1))
src << "<span class='alert'>You mutate!</span>"
randmutb(src)
domutcheck(src,null)
emote("gasp")
updatehealth()
if(75 to 100)
radiation -= 3
adjustToxLoss(3)
damage = 3
if(prob(1))
src << "<span class='alert'>You mutate!</span>"
randmutb(src)
domutcheck(src,null)
emote("gasp")
updatehealth()
else
radiation -= 5
adjustToxLoss(5)
damage = 5
if(prob(1))
src << "<span class='alert'>You mutate!</span>"
randmutb(src)
domutcheck(src,null)
emote("gasp")
updatehealth()
if(damage && organs.len)
var/obj/item/organ/external/O = pick(organs)
if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)
if(damage && organs.len)
var/obj/item/organ/external/O = pick(organs)
if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)
/mob/living/carbon/human/breathe()
if(reagents.has_reagent("lexorin"))
@@ -844,7 +845,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
//the analgesic effect wears off slowly
analgesic = max(0, analgesic - 1)
if(hallucination && !(species.flags & NO_DNA_RAD))
if(hallucination)
spawn()
handle_hallucinations()
code/modules/mob/living/carbon/human/species/skeleton.dm
+33
View File
@@ -0,0 +1,33 @@
/datum/species/skeleton
name = "Skeleton"
name_plural = "Skeletons"
blurb = "Spoopy and scary."
icobase = 'icons/mob/human_races/r_skeleton.dmi'
deform = 'icons/mob/human_races/r_skeleton.dmi'
path = /mob/living/carbon/human/skeleton
default_language = "Galactic Common"
unarmed_type = /datum/unarmed_attack/punch
blood_color = "#FFFFFF"
flesh_color = "#E6E6C6"
flags = NO_BREATHE | NO_BLOOD | RADIMMUNE
virus_immune = 1 //why is this a var and not a flag?
dietflags = DIET_OMNI
reagent_tag = PROCESS_ORG
warning_low_pressure = -1
hazard_low_pressure = -1
hazard_high_pressure = 999999999
warning_high_pressure = 999999999
cold_level_1 = -1
cold_level_2 = -1
cold_level_3 = -1
heat_level_1 = 999999999
heat_level_2 = 999999999
heat_level_3 = 999999999
heat_level_3_breathe = 999999999
code/modules/mob/living/carbon/human/species/station.dm
+1 -1
View File
@@ -496,7 +496,7 @@
passive_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment.
flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA_RAD | NO_POISON
flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | NO_POISON | RADIMMUNE
clothing_flags = HAS_SOCKS
bodyflags = HAS_SKIN_COLOR
dietflags = 0 //IPCs can't eat, so no diet
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -78,7 +78,7 @@
return 1
/mob/living/carbon/human/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0)
if((effecttype == IRRADIATE) && (species.flags & NO_DNA_RAD))
if((effecttype == IRRADIATE) && (species.flags & RADIMMUNE))
return 0
return ..()
code/modules/mob/new_player/sprite_accessories.dm
+7 -7
View File
@@ -64,7 +64,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skellington")
species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skeleton")
short
name = "Short Hair" // try to capatilize the names please~
@@ -1069,7 +1069,7 @@
/datum/sprite_accessory/underwear
icon = 'icons/mob/underwear.dmi'
species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skellington")
species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skeleton")
nude
name = "Nude"
@@ -1217,7 +1217,7 @@
/datum/sprite_accessory/undershirt
icon = 'icons/mob/underwear.dmi'
species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skellington")
species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skeleton")
/datum/sprite_accessory/undershirt/nude
name = "Nude"
@@ -1503,13 +1503,13 @@
///////////////////////
/datum/sprite_accessory/socks
icon = 'icons/mob/underwear.dmi'
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skellington")
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton")
/datum/sprite_accessory/socks/nude
name = "Nude"
icon_state = null
gender = NEUTER
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skellington","Vox")
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
/datum/sprite_accessory/socks/white_norm
@@ -1681,7 +1681,7 @@
/datum/sprite_accessory/head_accessory/none
name = "None"
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skellington","Vox")
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/head_accessory/simple
@@ -1773,7 +1773,7 @@
/datum/sprite_accessory/body_markings/none
name = "None"
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skellington","Vox")
species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/body_markings/stripe