mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-12 08:27:24 +01:00
@@ -290,7 +290,7 @@
|
||||
|
||||
observer.started_as_observer = TRUE
|
||||
src.client.respawn_observing = 1
|
||||
src.client.lastrespawn = world.time + 180 SECONDS //reset respawn.
|
||||
src.client.lastrespawn = world.time + respawn_time SECONDS
|
||||
close_spawn_windows()
|
||||
var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
|
||||
to_chat(src, "<span class='notice'>Now teleporting.</span>")
|
||||
|
||||
@@ -833,8 +833,7 @@
|
||||
icon_state = "hair_tailhair2"
|
||||
ckeys_allowed = list("quotefox")
|
||||
|
||||
//Hair gradients
|
||||
|
||||
// GS13: Hair gradients from Skyrat
|
||||
|
||||
/datum/sprite_accessory/hair_gradient
|
||||
icon = 'icons/mob/hair_gradients.dmi'
|
||||
|
||||
@@ -287,9 +287,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
|
||||
// CITADEL EDIT
|
||||
if(istype(loc, /obj/machinery/cryopod))
|
||||
var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait a minute before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
|
||||
// GS13: "a minute"
|
||||
var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait [respawn_time] seconds before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
|
||||
if(response != "Ghost")//darn copypaste
|
||||
client.lastrespawn = world.time + 180 SECONDS //set respawn time
|
||||
client.lastrespawn = world.time + respawn_time SECONDS
|
||||
return
|
||||
var/obj/machinery/cryopod/C = loc
|
||||
C.despawn_occupant()
|
||||
|
||||
Reference in New Issue
Block a user