mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Fix improper skin tones and lots of DNA inconsistencies. Improve mob spawners by a little (#29271)
* sane appearance * updatepaths * flip-vitiligo * equal color options * ... * Update golems.dm * typo
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
max_integrity = 200
|
||||
|
||||
var/faction = list("ashwalker")
|
||||
var/meat_counter = 6
|
||||
|
||||
/obj/structure/lavaland/ash_walker/Initialize(mapload)
|
||||
@@ -57,28 +56,24 @@
|
||||
/obj/effect/mob_spawn/human/alive/ash_walker
|
||||
name = "ash walker egg"
|
||||
desc = "A man-sized yellow egg, spawned from some unfathomable creature. A humanoid silhouette lurks within."
|
||||
mob_name = "an ash walker"
|
||||
role_name = "ash walker"
|
||||
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
|
||||
icon_state = "large_egg"
|
||||
mob_species = /datum/species/unathi/ashwalker
|
||||
outfit = /datum/outfit/ashwalker
|
||||
roundstart = FALSE
|
||||
death = FALSE
|
||||
anchored = FALSE
|
||||
move_resist = MOVE_FORCE_NORMAL
|
||||
density = FALSE
|
||||
death_cooldown = 300 SECONDS
|
||||
important_info = "Do not leave Lavaland without admin permission. Do not attack the mining outpost without being provoked."
|
||||
description = "You are an ashwalker, a native inhabitant of Lavaland. Try to survive with nothing but spears and other tribal technology. Bring dead bodies back to your tendril to create more of your kind. You are free to attack miners and other outsiders."
|
||||
flavour_text = "Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. \
|
||||
You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. \
|
||||
Keep in mind - your speed is given to you by the power of the Necropolis, <b>leaving the planet will make your body more lethargic!</b>"
|
||||
assignedrole = "Ash Walker"
|
||||
density = FALSE
|
||||
anchored = FALSE
|
||||
move_resist = MOVE_FORCE_NORMAL
|
||||
death_cooldown = 300 SECONDS
|
||||
allow_gender_pick = TRUE
|
||||
mob_species = /datum/species/unathi/ashwalker
|
||||
outfit = /datum/outfit/ashwalker
|
||||
|
||||
/obj/effect/mob_spawn/human/alive/ash_walker/special(mob/living/carbon/human/new_spawn)
|
||||
new_spawn.rename_character(new_spawn.real_name, new_spawn.dna.species.get_random_name(new_spawn.gender))
|
||||
new_spawn.mind.offstation_role = TRUE
|
||||
|
||||
to_chat(new_spawn, "<b>Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Glory to the Necropolis!</b>")
|
||||
to_chat(new_spawn, "<span class='motd'>For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Ash_Walker)</span>")
|
||||
|
||||
@@ -89,7 +84,7 @@
|
||||
notify_ghosts("An ash walker egg is ready to hatch in \the [A.name].", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
|
||||
|
||||
/datum/outfit/ashwalker
|
||||
name ="Ashwalker"
|
||||
name = "Ashwalker"
|
||||
head = /obj/item/clothing/head/helmet/gladiator
|
||||
uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
|
||||
|
||||
|
||||
@@ -2,27 +2,21 @@
|
||||
/obj/effect/mob_spawn/human/alive/hermit
|
||||
name = "malfunctioning cryostasis sleeper"
|
||||
desc = "A humming sleeper with a silhouetted occupant inside. Its stasis function is broken and it's likely being used as a bed."
|
||||
mob_name = "a stranded hermit"
|
||||
role_name = "stranded hermit"
|
||||
icon = 'icons/obj/lavaland/spawners.dmi'
|
||||
icon_state = "cryostasis_sleeper"
|
||||
roundstart = FALSE
|
||||
death = FALSE
|
||||
random = TRUE
|
||||
allow_species_pick = TRUE
|
||||
mob_species = /datum/species/human
|
||||
description = "You are a single survivor stranded on lavaland in a makeshift shelter. Try to survive with barely any equipment. For when miner is just too boring."
|
||||
flavour_text = "You've been stranded in this godless prison of a planet for longer than you can remember. Each day you barely scrape by, and between the terrible \
|
||||
conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
|
||||
the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... "
|
||||
assignedrole = "Hermit"
|
||||
allow_species_pick = TRUE
|
||||
allow_gender_pick = TRUE
|
||||
outfit = /datum/outfit/hermit
|
||||
|
||||
/obj/effect/mob_spawn/human/alive/hermit/Initialize(mapload)
|
||||
. = ..()
|
||||
var/arrpee = rand(1,4)
|
||||
outfit.suit = /obj/item/clothing/suit/space/syndicate/orange
|
||||
outfit.head = /obj/item/clothing/head/helmet/space/syndicate/orange
|
||||
outfit.shoes = /obj/item/clothing/shoes/black
|
||||
outfit.back = /obj/item/storage/backpack
|
||||
switch(arrpee)
|
||||
if(1)
|
||||
flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \
|
||||
@@ -49,3 +43,9 @@
|
||||
/obj/effect/mob_spawn/human/alive/hermit/Destroy()
|
||||
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
|
||||
return ..()
|
||||
|
||||
/datum/outfit/hermit
|
||||
suit = /obj/item/clothing/suit/space/syndicate/orange
|
||||
head = /obj/item/clothing/head/helmet/space/syndicate/orange
|
||||
shoes = /obj/item/clothing/shoes/black
|
||||
back = /obj/item/storage/backpack
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/obj/effect/spawner/random/seed_vault
|
||||
name = "seed vault seeds"
|
||||
|
||||
loot = list(
|
||||
/obj/item/food/grown/mushroom/glowshroom/glowcap = 10,
|
||||
/obj/item/seeds/cherry/bomb = 10,
|
||||
@@ -11,7 +10,7 @@
|
||||
/obj/effect/mob_spawn/human/alive/seed_vault
|
||||
name = "preserved terrarium"
|
||||
desc = "An ancient machine that seems to be used for storing plant matter. The glass is obstructed by a mat of vines."
|
||||
mob_name = "a lifebringer"
|
||||
role_name = "lifebringer"
|
||||
icon = 'icons/obj/lavaland/spawners.dmi'
|
||||
icon_state = "terrarium"
|
||||
density = TRUE
|
||||
@@ -24,10 +23,10 @@
|
||||
for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago."
|
||||
assignedrole = "Seed Vault Diona"
|
||||
|
||||
/obj/effect/mob_spawn/human/alive/seed_vault/special(mob/living/new_spawn)
|
||||
var/plant_name = pick("Tomato", "Potato", "Broccoli", "Carrot", "Ambrosia", "Pumpkin", "Ivy", "Kudzu", "Banana", "Moss", "Flower", "Bloom", "Root", "Bark", "Glowshroom", "Petal", "Leaf", \
|
||||
"Venus", "Sprout","Cocoa", "Strawberry", "Citrus", "Oak", "Cactus", "Pepper", "Juniper")
|
||||
new_spawn.rename_character(null, plant_name)
|
||||
/obj/effect/mob_spawn/human/alive/seed_vault/Initialize(mapload)
|
||||
mob_name = pick("Tomato", "Potato", "Broccoli", "Carrot", "Ambrosia", "Pumpkin", "Ivy", "Kudzu", "Banana", "Moss", "Flower", "Bloom", "Root", "Bark", "Glowshroom", "Petal", "Leaf", \
|
||||
"Venus", "Sprout", "Cocoa", "Strawberry", "Citrus", "Oak", "Cactus", "Pepper", "Juniper")
|
||||
return ..()
|
||||
|
||||
/obj/effect/mob_spawn/human/alive/seed_vault/Destroy()
|
||||
new/obj/structure/fluff/empty_terrarium(get_turf(src))
|
||||
|
||||
@@ -24,9 +24,7 @@
|
||||
// Spawners
|
||||
/obj/effect/mob_spawn/human/alive/spacebase_syndicate
|
||||
name = "Syndicate Researcher sleeper"
|
||||
mob_name = "Syndicate Researcher"
|
||||
roundstart = FALSE
|
||||
death = FALSE
|
||||
role_name = "syndicate researcher"
|
||||
icon = 'icons/obj/cryogenic2.dmi'
|
||||
icon_state = "sleeper_s"
|
||||
important_info = "Do not work against traitors or nukies. Do not leave the base."
|
||||
@@ -36,7 +34,9 @@
|
||||
assignedrole = "Syndicate Researcher"
|
||||
del_types = list() // Necessary to prevent del_types from removing radio!
|
||||
allow_species_pick = TRUE
|
||||
allow_gender_pick = TRUE
|
||||
skin_tone = 2
|
||||
faction = list("syndicate")
|
||||
|
||||
/obj/effect/mob_spawn/human/alive/spacebase_syndicate/Destroy()
|
||||
var/obj/structure/fluff/empty_sleeper/syndicate/S = new /obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
|
||||
@@ -49,7 +49,7 @@
|
||||
suit = /obj/item/clothing/suit/storage/labcoat
|
||||
shoes = /obj/item/clothing/shoes/combat
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
r_ear = /obj/item/radio/headset/syndicate/alt/nocommon // See del_types above
|
||||
l_ear = /obj/item/radio/headset/syndicate/alt/nocommon // See del_types above
|
||||
back = /obj/item/storage/backpack
|
||||
belt = /obj/item/storage/belt/utility/syndi_researcher
|
||||
r_pocket = /obj/item/gun/projectile/automatic/pistol
|
||||
@@ -63,9 +63,6 @@
|
||||
|
||||
/datum/outfit/spacebase_syndicate/post_equip(mob/living/carbon/human/H)
|
||||
. = ..()
|
||||
H.faction |= "syndicate"
|
||||
var/random_name = random_name(pick(MALE,FEMALE), H.dna.species.name)
|
||||
H.rename_character(H.real_name, random_name)
|
||||
H.job = "Syndi Researcher" // ensures they show up right in player panel for admins
|
||||
if(isunathi(H) || isvulpkanin(H) || istajaran(H) || isskrell(H))
|
||||
H.change_skin_color("#B2B2B2")
|
||||
@@ -74,3 +71,5 @@
|
||||
H.change_markings("White Fly Markings", "body")
|
||||
H.change_head_accessory("White Fly Antennae")
|
||||
H.change_body_accessory("White Fly Wings")
|
||||
H.update_dna()
|
||||
H.regenerate_icons()
|
||||
|
||||
Reference in New Issue
Block a user