birdywankenobi

This commit is contained in:
Purpose
2018-10-20 13:39:03 +01:00
parent 716b89ec6a
commit 5cf27a4806
3 changed files with 31 additions and 27 deletions
+6 -7
View File
@@ -35,17 +35,16 @@
return data
/datum/spawners_menu/Topic(href, href_list)
to_chat(src,"FUCKKK")
if(..())
return
to_chat(src, GLOB.mob_spawners.len)
var/spawner_ref = pick(GLOB.mob_spawners[href_list["name"]])
return 1
//var/spawner_ref = pick(GLOB.mob_spawners[href_list["name"]])
var/spawner_ref = href["name"]
to_chat(src,spawner_ref)
var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list
if(!MS)
to_chat(src,"wank")
return
to_chat(src,"FUCweweKKK")
switch(href_list)
to_chat(src,"ms passed!")
switch(href)
if("jump")
if(MS)
owner.forceMove(get_turf(MS))
+10 -7
View File
@@ -6,6 +6,8 @@
/obj/effect/mob_spawn
name = "Unknown"
density = TRUE
anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
var/mob_type = null
@@ -26,13 +28,12 @@
var/datum/disease/disease = null //Do they start with a pre-spawned disease?
var/mob_color //Change the mob's color
var/assignedrole
density = TRUE
anchored = TRUE
var/banType = "lavaland"
var/ghost_usable = TRUE
/obj/effect/mob_spawn/attack_ghost(mob/user)
if(ticker.current_state != GAME_STATE_PLAYING || !loc)
if(ticker.current_state != GAME_STATE_PLAYING || !loc || !ghost_usable)
return
if(!uses)
to_chat(user, "<span class='warning'>This spawner is out of charges!</span>")
@@ -40,6 +41,8 @@
if(jobban_isbanned(user, banType))
to_chat(user, "<span class='warning'>You are jobanned!</span>")
return
if(QDELETED(src) || QDELETED(user))
return
var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
if(ghost_role == "No" || !loc)
return
@@ -50,7 +53,7 @@
. = ..()
if(instant || roundstart) //at some point we should probably re-introduce the (ticker && ticker.current_state > GAME_STATE_SETTING_UP) portion of this check, but for now it was preventing the corpses from spawning at roundstart and resulting in ghost role spawners that made dead bodies.
create()
else
else if(ghost_usable)
GLOB.poi_list |= src
LAZYADD(GLOB.mob_spawners[name], src)
@@ -305,7 +308,7 @@
name = "sleeper"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a space doctor!"
flavour_text = "<span class='big bold'>You are a space doctor!</span>"
assignedrole = "Space Doctor"
/obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H)
@@ -436,7 +439,7 @@
name = "bartender sleeper"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a space bartender!"
flavour_text = "<span class='big bold'>You are a space bartender!</span><b> Time to mix drinks and change lives.</b>"
assignedrole = "Space Bartender"
/datum/outfit/spacebartender
@@ -556,4 +559,4 @@
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/black
suit = /obj/item/clothing/suit/armor/vest
glasses = /obj/item/clothing/glasses/sunglasses/reagent
glasses = /obj/item/clothing/glasses/sunglasses/reagent
+15 -13
View File
@@ -1,16 +1,18 @@
<div class='statusDisplay'>
{{for data.spawners}}
<div class='item'>
<div class='itemLabel'>
{{:value.name}}
<table style='width:100%;'>
{{for data.spawners}}
<div class='item'>
<div class='itemLabel'>
{{:value.name}}
</div>
<div class='itemContent'>
{{:value.desc}}
</div>
<div class='floatRight'>
{{:helper.link('Jump', null, {'action': value.name})}}
{{:helper.link('Spawn', null, {'action': value.name})}}
</div>
</div>
<div class='itemContent'>
{{:value.desc}}
</div>
<div class='floatRight'>
{{:helper.link('Jump', '', {'jump': value.name})}}
{{:helper.link('Spawn', '', {'spawn': value.name})}}
</div>
</div>
{{/for}}
{{/for}}
</table>
</div>