Fixes old simple animal humanoid issues (#32214)
* fixes issue * ignore that * Spacebattle doesn't even open in DM * Conflicts fixed for real * Fixes pathing weirdness * wonderful
This commit is contained in:
committed by
CitadelStationBot
parent
241d2d88e6
commit
f8bd9ecf9c
@@ -130,6 +130,10 @@
|
|||||||
var/backpack_contents = -1
|
var/backpack_contents = -1
|
||||||
var/suit_store = -1
|
var/suit_store = -1
|
||||||
|
|
||||||
|
var/hair_style
|
||||||
|
var/facial_hair_style
|
||||||
|
var/skin_tone
|
||||||
|
|
||||||
/obj/effect/mob_spawn/human/Initialize()
|
/obj/effect/mob_spawn/human/Initialize()
|
||||||
if(ispath(outfit))
|
if(ispath(outfit))
|
||||||
outfit = new outfit()
|
outfit = new outfit()
|
||||||
@@ -147,6 +151,20 @@
|
|||||||
H.underwear = "Nude"
|
H.underwear = "Nude"
|
||||||
H.undershirt = "Nude"
|
H.undershirt = "Nude"
|
||||||
H.socks = "Nude"
|
H.socks = "Nude"
|
||||||
|
if(hair_style)
|
||||||
|
H.hair_style = hair_style
|
||||||
|
else
|
||||||
|
H.hair_style = random_hair_style(gender)
|
||||||
|
if(facial_hair_style)
|
||||||
|
H.facial_hair_style = facial_hair_style
|
||||||
|
else
|
||||||
|
H.facial_hair_style = random_facial_hair_style(gender)
|
||||||
|
if(skin_tone)
|
||||||
|
H.skin_tone = skin_tone
|
||||||
|
else
|
||||||
|
H.skin_tone = random_skin_tone()
|
||||||
|
H.update_hair()
|
||||||
|
H.update_body()
|
||||||
if(outfit)
|
if(outfit)
|
||||||
var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
|
var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
|
||||||
for(var/slot in slots)
|
for(var/slot in slots)
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
name = "Syndicate Operative"
|
name = "Syndicate Operative"
|
||||||
id_job = "Operative"
|
id_job = "Operative"
|
||||||
id_access_list = list(ACCESS_SYNDICATE)
|
id_access_list = list(ACCESS_SYNDICATE)
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
outfit = /datum/outfit/syndicatesoldiercorpse
|
outfit = /datum/outfit/syndicatesoldiercorpse
|
||||||
|
|
||||||
/datum/outfit/syndicatesoldiercorpse
|
/datum/outfit/syndicatesoldiercorpse
|
||||||
@@ -31,6 +33,8 @@
|
|||||||
name = "Syndicate Commando"
|
name = "Syndicate Commando"
|
||||||
id_job = "Operative"
|
id_job = "Operative"
|
||||||
id_access_list = list(ACCESS_SYNDICATE)
|
id_access_list = list(ACCESS_SYNDICATE)
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
outfit = /datum/outfit/syndicatecommandocorpse
|
outfit = /datum/outfit/syndicatecommandocorpse
|
||||||
|
|
||||||
/datum/outfit/syndicatecommandocorpse
|
/datum/outfit/syndicatecommandocorpse
|
||||||
@@ -50,6 +54,8 @@
|
|||||||
name = "Syndicate Stormtrooper"
|
name = "Syndicate Stormtrooper"
|
||||||
id_job = "Operative"
|
id_job = "Operative"
|
||||||
id_access_list = list(ACCESS_SYNDICATE)
|
id_access_list = list(ACCESS_SYNDICATE)
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
outfit = /datum/outfit/syndicatestormtroopercorpse
|
outfit = /datum/outfit/syndicatestormtroopercorpse
|
||||||
|
|
||||||
/datum/outfit/syndicatestormtroopercorpse
|
/datum/outfit/syndicatestormtroopercorpse
|
||||||
@@ -67,11 +73,16 @@
|
|||||||
/obj/effect/mob_spawn/human/clown/corpse
|
/obj/effect/mob_spawn/human/clown/corpse
|
||||||
roundstart = FALSE
|
roundstart = FALSE
|
||||||
instant = TRUE
|
instant = TRUE
|
||||||
|
skin_tone = "caucasian1"
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
|
|
||||||
/obj/effect/mob_spawn/human/corpse/pirate
|
/obj/effect/mob_spawn/human/corpse/pirate
|
||||||
name = "Pirate"
|
name = "Pirate"
|
||||||
|
skin_tone = "Caucasian1" //all pirates are white because it's easier that way
|
||||||
outfit = /datum/outfit/piratecorpse
|
outfit = /datum/outfit/piratecorpse
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
|
|
||||||
/datum/outfit/piratecorpse
|
/datum/outfit/piratecorpse
|
||||||
name = "Pirate Corpse"
|
name = "Pirate Corpse"
|
||||||
@@ -94,12 +105,17 @@
|
|||||||
/obj/effect/mob_spawn/human/corpse/russian
|
/obj/effect/mob_spawn/human/corpse/russian
|
||||||
name = "Russian"
|
name = "Russian"
|
||||||
outfit = /datum/outfit/russiancorpse
|
outfit = /datum/outfit/russiancorpse
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
|
|
||||||
/datum/outfit/russiancorpse
|
/datum/outfit/russiancorpse
|
||||||
name = "Russian Corpse"
|
name = "Russian Corpse"
|
||||||
uniform = /obj/item/clothing/under/soviet
|
uniform = /obj/item/clothing/under/soviet
|
||||||
shoes = /obj/item/clothing/shoes/jackboots
|
shoes = /obj/item/clothing/shoes/jackboots
|
||||||
head = /obj/item/clothing/head/bearpelt
|
head = /obj/item/clothing/head/bearpelt
|
||||||
|
gloves = /obj/item/clothing/gloves/color/black
|
||||||
|
mask = /obj/item/clothing/mask/gas
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/obj/effect/mob_spawn/human/corpse/russian/ranged
|
/obj/effect/mob_spawn/human/corpse/russian/ranged
|
||||||
@@ -109,6 +125,7 @@
|
|||||||
name = "Ranged Russian Corpse"
|
name = "Ranged Russian Corpse"
|
||||||
head = /obj/item/clothing/head/ushanka
|
head = /obj/item/clothing/head/ushanka
|
||||||
|
|
||||||
|
|
||||||
/obj/effect/mob_spawn/human/corpse/russian/ranged/trooper
|
/obj/effect/mob_spawn/human/corpse/russian/ranged/trooper
|
||||||
outfit = /datum/outfit/russiancorpse/ranged/trooper
|
outfit = /datum/outfit/russiancorpse/ranged/trooper
|
||||||
|
|
||||||
@@ -119,8 +136,8 @@
|
|||||||
shoes = /obj/item/clothing/shoes/combat
|
shoes = /obj/item/clothing/shoes/combat
|
||||||
gloves = /obj/item/clothing/gloves/combat
|
gloves = /obj/item/clothing/gloves/combat
|
||||||
ears = /obj/item/device/radio/headset
|
ears = /obj/item/device/radio/headset
|
||||||
mask = /obj/item/clothing/mask/balaclava
|
|
||||||
head = /obj/item/clothing/head/helmet/alt
|
head = /obj/item/clothing/head/helmet/alt
|
||||||
|
mask = /obj/item/clothing/mask/balaclava
|
||||||
|
|
||||||
|
|
||||||
/obj/effect/mob_spawn/human/corpse/russian/ranged/officer
|
/obj/effect/mob_spawn/human/corpse/russian/ranged/officer
|
||||||
@@ -131,7 +148,7 @@
|
|||||||
name = "Russian Officer Corpse"
|
name = "Russian Officer Corpse"
|
||||||
uniform = /obj/item/clothing/under/rank/security/navyblue/russian
|
uniform = /obj/item/clothing/under/rank/security/navyblue/russian
|
||||||
suit = /obj/item/clothing/suit/security/officer/russian
|
suit = /obj/item/clothing/suit/security/officer/russian
|
||||||
shoes = /obj/item/clothing/shoes/laceup
|
shoes = /obj/item/clothing/shoes/combat
|
||||||
ears = /obj/item/device/radio/headset
|
ears = /obj/item/device/radio/headset
|
||||||
head = /obj/item/clothing/head/ushanka
|
head = /obj/item/clothing/head/ushanka
|
||||||
|
|
||||||
@@ -139,6 +156,9 @@
|
|||||||
/obj/effect/mob_spawn/human/corpse/wizard
|
/obj/effect/mob_spawn/human/corpse/wizard
|
||||||
name = "Space Wizard Corpse"
|
name = "Space Wizard Corpse"
|
||||||
outfit = /datum/outfit/wizardcorpse
|
outfit = /datum/outfit/wizardcorpse
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Long Beard"
|
||||||
|
skin_tone = "Caucasian1"
|
||||||
|
|
||||||
/datum/outfit/wizardcorpse
|
/datum/outfit/wizardcorpse
|
||||||
name = "Space Wizard Corpse"
|
name = "Space Wizard Corpse"
|
||||||
@@ -153,6 +173,8 @@
|
|||||||
id_job = "Private Security Force"
|
id_job = "Private Security Force"
|
||||||
id_access = "Security Officer"
|
id_access = "Security Officer"
|
||||||
outfit = /datum/outfit/nanotrasensoldiercorpse2
|
outfit = /datum/outfit/nanotrasensoldiercorpse2
|
||||||
|
hair_style = "Bald"
|
||||||
|
facial_hair_style = "Shaved"
|
||||||
|
|
||||||
/datum/outfit/nanotrasensoldiercorpse2
|
/datum/outfit/nanotrasensoldiercorpse2
|
||||||
name = "NT Private Security Officer Corpse"
|
name = "NT Private Security Officer Corpse"
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
environment_smash = ENVIRONMENT_SMASH_NONE
|
environment_smash = ENVIRONMENT_SMASH_NONE
|
||||||
del_on_death = 0
|
del_on_death = 0
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace
|
/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace //this should be in a different file
|
||||||
name = "Nanotrasen Private Security Officer"
|
name = "Nanotrasen Private Security Officer"
|
||||||
desc = "An officer part of Nanotrasen's private security force."
|
desc = "An officer part of Nanotrasen's private security force."
|
||||||
icon = 'icons/mob/simple_human.dmi'
|
icon = 'icons/mob/simple_human.dmi'
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 76 KiB |
Reference in New Issue
Block a user