mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
Cleaned up species code, remove naked requirement
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
|
||||
blood_color = "#CCCCCC"
|
||||
flesh_color = "#AAAAAA"
|
||||
butt = "plasma"
|
||||
has_organ = list(
|
||||
"brain" = /obj/item/organ/brain
|
||||
)
|
||||
|
||||
@@ -78,7 +78,6 @@
|
||||
//Used in icon caching.
|
||||
var/race_key = 0
|
||||
var/icon/icon_template
|
||||
var/butt = "human"//Determines which image to use for copier
|
||||
var/is_small
|
||||
var/show_ssd = 1
|
||||
var/virus_immune
|
||||
|
||||
@@ -53,7 +53,6 @@
|
||||
heat_level_3_breathe = 1100 //Default 1000
|
||||
|
||||
flesh_color = "#34AF10"
|
||||
butt = "unathi"
|
||||
reagent_tag = PROCESS_ORG
|
||||
base_color = "#066000"
|
||||
|
||||
@@ -98,7 +97,6 @@
|
||||
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
|
||||
bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
|
||||
dietflags = DIET_OMNI
|
||||
butt = "tajaran"
|
||||
reagent_tag = PROCESS_ORG
|
||||
flesh_color = "#AFA59E"
|
||||
base_color = "#333333"
|
||||
@@ -134,7 +132,6 @@
|
||||
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
|
||||
bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
|
||||
dietflags = DIET_OMNI
|
||||
butt = "vulp"
|
||||
reagent_tag = PROCESS_ORG
|
||||
flesh_color = "#966464"
|
||||
base_color = "#BE8264"
|
||||
@@ -163,7 +160,6 @@
|
||||
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
|
||||
bodyflags = HAS_SKIN_COLOR
|
||||
dietflags = DIET_HERB
|
||||
butt = "skrell"
|
||||
flesh_color = "#8CD7A3"
|
||||
blood_color = "#1D2CBF"
|
||||
reagent_tag = PROCESS_ORG
|
||||
@@ -179,7 +175,6 @@
|
||||
language = "Vox-pidgin"
|
||||
speech_sounds = list('sound/voice/shriek1.ogg')
|
||||
speech_chance = 20
|
||||
butt = "vox"
|
||||
unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too.
|
||||
|
||||
blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \
|
||||
@@ -309,7 +304,6 @@
|
||||
clothing_flags = HAS_SOCKS
|
||||
bodyflags = FEET_CLAWS
|
||||
dietflags = DIET_HERB
|
||||
butt = "kidan"
|
||||
blood_color = "#FB9800"
|
||||
reagent_tag = PROCESS_ORG
|
||||
|
||||
@@ -328,7 +322,6 @@
|
||||
bodyflags = HAS_SKIN_COLOR
|
||||
bloodflags = BLOOD_SLIME
|
||||
dietflags = DIET_CARN
|
||||
butt = "slime"
|
||||
reagent_tag = PROCESS_ORG
|
||||
//ventcrawler = 1 //ventcrawling commented out
|
||||
|
||||
@@ -355,7 +348,6 @@
|
||||
flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT
|
||||
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
|
||||
dietflags = DIET_HERB
|
||||
butt = "grey"
|
||||
reagent_tag = PROCESS_ORG
|
||||
blood_color = "#A200FF"
|
||||
|
||||
@@ -408,7 +400,6 @@
|
||||
dietflags = 0 //Diona regenerate nutrition in light, no diet necessary
|
||||
|
||||
body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not
|
||||
butt = "diona"
|
||||
blood_color = "#004400"
|
||||
flesh_color = "#907E4A"
|
||||
|
||||
@@ -503,7 +494,6 @@
|
||||
clothing_flags = HAS_SOCKS
|
||||
bodyflags = HAS_SKIN_COLOR
|
||||
dietflags = 0 //IPCs can't eat, so no diet
|
||||
butt = "machine"
|
||||
blood_color = "#1F181F"
|
||||
flesh_color = "#AAAAAA"
|
||||
virus_immune = 1
|
||||
|
||||
@@ -224,13 +224,36 @@
|
||||
|
||||
/obj/machinery/photocopier/proc/copyass()
|
||||
var/icon/temp_img
|
||||
if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit)))
|
||||
usr << "<span class='notice'>You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>"
|
||||
return
|
||||
if(check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
|
||||
if(ishuman(ass)) //Suit checks are in check_ass
|
||||
var/mob/living/carbon/human/H = ass
|
||||
temp_img = icon('icons/obj/butts.dmi', "[H.species.butt]")
|
||||
switch(H.get_species())
|
||||
if("Human")
|
||||
temp_img = icon('icons/obj/butts.dmi', "human")
|
||||
if("Tajaran")
|
||||
temp_img = icon('icons/obj/butts.dmi', "tajaran")
|
||||
if("Unathi")
|
||||
temp_img = icon('icons/obj/butts.dmi', "unathi")
|
||||
if("Skrell")
|
||||
temp_img = icon('icons/obj/butts.dmi', "skrell")
|
||||
if("Vox")
|
||||
temp_img = icon('icons/obj/butts.dmi', "vox")
|
||||
if("Kidan")
|
||||
temp_img = icon('icons/obj/butts.dmi', "kidan")
|
||||
if("Grey")
|
||||
temp_img = icon('icons/obj/butts.dmi', "grey")
|
||||
if("Diona")
|
||||
temp_img = icon('icons/obj/butts.dmi', "diona")
|
||||
if("Slime People")
|
||||
temp_img = icon('icons/obj/butts.dmi', "slime")
|
||||
if("Vulpkanin")
|
||||
temp_img = icon('icons/obj/butts.dmi', "vulp")
|
||||
if("Machine")
|
||||
temp_img = icon('icons/obj/butts.dmi', "machine")
|
||||
if("Plasmaman")
|
||||
temp_img = icon('icons/obj/butts.dmi', "plasma")
|
||||
else
|
||||
temp_img = icon('icons/obj/butts.dmi', "human")
|
||||
else if(istype(ass,/mob/living/silicon/robot/drone))
|
||||
temp_img = icon('icons/obj/butts.dmi', "drone")
|
||||
else if(istype(ass,/mob/living/simple_animal/diona))
|
||||
@@ -307,11 +330,6 @@
|
||||
ass = null
|
||||
updateUsrDialog()
|
||||
return 0
|
||||
else if(istype(ass,/mob/living/carbon/human))
|
||||
if(!ass.get_item_by_slot(slot_w_uniform) && !ass.get_item_by_slot(slot_wear_suit))
|
||||
return 1
|
||||
else
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user