[MIRROR] Gives ghost roles their own assigned_roles (#1887)

* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
This commit is contained in:
CitadelStationBot
2017-07-06 14:15:12 -05:00
committed by Poojawa
parent 24e0c88263
commit 2da7322cca
4 changed files with 28 additions and 0 deletions
+10
View File
@@ -20,6 +20,7 @@
var/oxy_damage = 0
var/burn_damage = 0
var/mob_color //Change the mob's color
var/assignedrole
density = 1
anchored = 1
var/banType = "lavaland"
@@ -82,6 +83,8 @@
if(objectives)
for(var/objective in objectives)
MM.objectives += new/datum/objective(objective)
if(assignedrole)
M.mind.assigned_role = assignedrole
special(M, name)
MM.name = M.real_name
if(uses > 0)
@@ -100,6 +103,7 @@
var/id_job = null //Such as "Clown" or "Chef." This just determines what the ID reads as, not their access
var/id_access = null //This is for access. See access.dm for which jobs give what access. Use "Captain" if you want it to be all access.
var/id_access_list = null //Allows you to manually add access to an ID card.
assignedrole = "Ghost Role"
var/husk = null
//these vars are for lazy mappers to override parts of the outfit
@@ -251,6 +255,7 @@
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a space doctor!"
assignedrole = "Space Doctor"
/obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H)
..()
@@ -305,6 +310,7 @@
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a space bartender!"
assignedrole = "Space Bartender"
/datum/outfit/spacebartender
name = "Space Bartender"
@@ -328,6 +334,7 @@
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a beach bum!"
assignedrole = "Beach Bum"
/datum/outfit/beachbum
name = "Beach Bum"
@@ -431,11 +438,13 @@
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
flavour_text = "By unknown powers, your skeletal remains have been reanimated! Walk this mortal plain and terrorize all living adventurers who dare cross your path."
assignedrole = "Skeleton"
/obj/effect/mob_spawn/human/zombie
name = "rotting corpse"
mob_name = "zombie"
mob_species = /datum/species/zombie
assignedrole = "Zombie"
/obj/effect/mob_spawn/human/zombie/alive
death = FALSE
@@ -465,6 +474,7 @@
permanent = TRUE
uses = -1
outfit = /datum/outfit/spacebartender
assignedrole = "Space Bar Patron"
/obj/effect/mob_spawn/human/alive/space_bar_patron/attack_hand(mob/user)
var/despawn = alert("Return to cryosleep? (Warning, Your mob will be deleted!)",,"Yes","No")