mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
remove partially duplicated code (#8448)
This commit is contained in:
@@ -32,11 +32,12 @@
|
||||
var/list/tail_type = null
|
||||
var/list/ear_type = null
|
||||
var/list/wing_type = null
|
||||
var/hair = null // CHOMPAdd
|
||||
var/corpsesynthtype = 0 // 0 for organic, 1 for drone, 2 for posibrain
|
||||
var/corpsesynthbrand = "Unbranded"
|
||||
var/corpsesensormode = 0 //CHOMPAdd - For setting the suit sensors of a corpse. Default to 0 so we don't annoy medbay.
|
||||
|
||||
/obj/effect/landmark/mobcorpse/New()
|
||||
/obj/effect/landmark/mobcorpse/Initialize() //CHOMPEdit
|
||||
createCorpse()
|
||||
|
||||
/obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
|
||||
@@ -86,6 +87,11 @@
|
||||
M.g_ears3 = color_rgb_list[2]
|
||||
M.b_ears3 = color_rgb_list[3]
|
||||
M.update_hair()
|
||||
//CHOMPAdd Start
|
||||
if(hair)
|
||||
M.h_style = hair
|
||||
M.update_hair()
|
||||
//CHOMPAdd End
|
||||
if(wing_type && wing_type.len)
|
||||
if(wing_type[1] in wing_styles_list)
|
||||
M.wing_style = wing_styles_list[wing_type[1]]
|
||||
|
||||
@@ -4,64 +4,8 @@
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox
|
||||
name = "vox"
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/New()
|
||||
createvoxCorpse()
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/proc/createvoxCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
|
||||
var/mob/living/carbon/human/vox/M = new /mob/living/carbon/human/vox (src.loc)
|
||||
M.real_name = src.name
|
||||
M.stat = 2 //Kills the new mob
|
||||
if(src.corpseuniform)
|
||||
M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform)
|
||||
if(M.w_uniform)
|
||||
M.w_uniform?:sensor_mode = corpsesensormode
|
||||
if(src.corpsesuit)
|
||||
M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit)
|
||||
if(src.corpseshoes)
|
||||
M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes)
|
||||
if(src.corpsegloves)
|
||||
M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves)
|
||||
if(src.corpseradio)
|
||||
M.equip_to_slot_or_del(new src.corpseradio(M), slot_l_ear)
|
||||
if(src.corpseglasses)
|
||||
M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses)
|
||||
if(src.corpsemask)
|
||||
M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask)
|
||||
if(src.corpsehelmet)
|
||||
M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head)
|
||||
if(src.corpsebelt)
|
||||
M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt)
|
||||
if(src.corpsepocket1)
|
||||
M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store)
|
||||
if(src.corpsepocket2)
|
||||
M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store)
|
||||
if(src.corpseback)
|
||||
M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
|
||||
if(src.corpseid == 1)
|
||||
var/obj/item/weapon/card/id/W = new(M)
|
||||
W.name = "[M.real_name]'s ID Card"
|
||||
var/datum/job/jobdatum
|
||||
for(var/jobtype in typesof(/datum/job))
|
||||
var/datum/job/J = new jobtype
|
||||
if(J.title == corpseidaccess)
|
||||
jobdatum = J
|
||||
break
|
||||
if(src.corpseidicon)
|
||||
W.icon_state = corpseidicon
|
||||
if(src.corpseidaccess)
|
||||
if(jobdatum)
|
||||
W.access = jobdatum.get_access()
|
||||
else
|
||||
W.access = list()
|
||||
if(corpseidjob)
|
||||
W.assignment = corpseidjob
|
||||
W.registered_name = M.real_name
|
||||
M.equip_to_slot_or_del(W, slot_wear_id)
|
||||
delete_me = 1
|
||||
qdel(src)
|
||||
|
||||
hair = "Short Vox Quills"
|
||||
species = SPECIES_VOX
|
||||
|
||||
//Types of Vox corpses:
|
||||
|
||||
@@ -72,7 +16,6 @@
|
||||
corpseshoes = /obj/item/clothing/shoes/boots/workboots
|
||||
corpsegloves = /obj/item/clothing/gloves/light_brown
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/boarder_m
|
||||
name = "vox melee boarder"
|
||||
@@ -81,7 +24,6 @@
|
||||
corpseshoes = /obj/item/clothing/shoes/boots/workboots
|
||||
corpsegloves = /obj/item/clothing/gloves/light_brown
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/boarder_r
|
||||
name = "vox ranged boarder"
|
||||
@@ -89,7 +31,6 @@
|
||||
corpsesuit = /obj/item/clothing/suit/armor/bulletproof
|
||||
corpseshoes = /obj/item/clothing/shoes/boots/workboots
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/boarder_t
|
||||
name = "vox salvage technician"
|
||||
@@ -97,7 +38,6 @@
|
||||
corpsesuit = /obj/item/clothing/suit/armor/bulletproof
|
||||
corpseshoes = /obj/item/clothing/shoes/boots/workboots
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/suppressor
|
||||
name = "vox suppressor"
|
||||
@@ -106,7 +46,6 @@
|
||||
corpseshoes = /obj/item/clothing/shoes/orange
|
||||
corpsegloves = /obj/item/clothing/gloves/red
|
||||
corpsemask = /obj/item/clothing/mask/gas/half
|
||||
corpseid = 0
|
||||
|
||||
/obj/effect/landmark/mobcorpse/vox/captain
|
||||
name = "vox captain"
|
||||
@@ -116,4 +55,3 @@
|
||||
corpsegloves = /obj/item/clothing/gloves/light_brown
|
||||
corpsemask = /obj/item/clothing/mask/breath
|
||||
corpsehelmet = /obj/item/clothing/head/helmet/riot
|
||||
corpseid = 0
|
||||
Reference in New Issue
Block a user