mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Makes a dark ritual even darker (#4923)
* makes a dark ritual even darker * makes the dark ritual maybe not THAT dark * tweaks rune icon
This commit is contained in:
@@ -126,3 +126,9 @@
|
|||||||
question = "A person suspended in cryosleep has been discovered by a crewmember \
|
question = "A person suspended in cryosleep has been discovered by a crewmember \
|
||||||
and they are attempting to open the cryopod. Would you like to play as the occupant?"
|
and they are attempting to open the cryopod. Would you like to play as the occupant?"
|
||||||
cutoff_number = 1
|
cutoff_number = 1
|
||||||
|
|
||||||
|
/datum/ghost_query/corgi_rune
|
||||||
|
role_name = "Dark Creature"
|
||||||
|
question = "A curious explorer has touched a mysterious rune. \
|
||||||
|
Would you like to play as the creature it summons?"
|
||||||
|
cutoff_number = 1
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
var/icon_state_opened = null // Icon to switch to when 'used'.
|
var/icon_state_opened = null // Icon to switch to when 'used'.
|
||||||
var/used = FALSE
|
var/used = FALSE
|
||||||
var/busy = FALSE // Don't spam ghosts by spamclicking.
|
var/busy = FALSE // Don't spam ghosts by spamclicking.
|
||||||
|
var/needscharger //For drone pods that want their pod to turn into a charger.
|
||||||
|
|
||||||
// Call this to get a ghost volunteer.
|
// Call this to get a ghost volunteer.
|
||||||
/obj/structure/ghost_pod/proc/trigger()
|
/obj/structure/ghost_pod/proc/trigger()
|
||||||
@@ -22,8 +23,10 @@
|
|||||||
if(winner.len)
|
if(winner.len)
|
||||||
var/mob/observer/dead/D = winner[1]
|
var/mob/observer/dead/D = winner[1]
|
||||||
create_occupant(D)
|
create_occupant(D)
|
||||||
new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
|
icon_state = icon_state_opened
|
||||||
del(src)
|
if(needscharger)
|
||||||
|
new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
|
||||||
|
del(src)
|
||||||
return TRUE
|
return TRUE
|
||||||
else
|
else
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
density = TRUE
|
density = TRUE
|
||||||
ghost_query_type = /datum/ghost_query/lost_drone
|
ghost_query_type = /datum/ghost_query/lost_drone
|
||||||
confirm_before_open = TRUE
|
confirm_before_open = TRUE
|
||||||
|
needscharger = TRUE
|
||||||
|
|
||||||
/obj/structure/ghost_pod/manual/lost_drone/trigger()
|
/obj/structure/ghost_pod/manual/lost_drone/trigger()
|
||||||
..()
|
..()
|
||||||
@@ -45,6 +46,7 @@
|
|||||||
icon_state_opened = "borg_pod_opened"
|
icon_state_opened = "borg_pod_opened"
|
||||||
density = TRUE
|
density = TRUE
|
||||||
ghost_query_type = /datum/ghost_query/gravekeeper_drone
|
ghost_query_type = /datum/ghost_query/gravekeeper_drone
|
||||||
|
needscharger = TRUE
|
||||||
|
|
||||||
/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
|
/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
|
||||||
density = FALSE
|
density = FALSE
|
||||||
@@ -58,4 +60,30 @@
|
|||||||
R.ckey = M.ckey
|
R.ckey = M.ckey
|
||||||
visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
|
visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
|
||||||
R.Namepick()
|
R.Namepick()
|
||||||
|
..()
|
||||||
|
|
||||||
|
/obj/structure/ghost_pod/manual/corgi
|
||||||
|
name = "glowing rune"
|
||||||
|
desc = "This rune slowly lights up and goes dim in a repeating pattern, like a slow heartbeat. It's almost as if it's calling out to you to touch it..."
|
||||||
|
description_info = "This will summon some manner of creature through quite dubious means. The creature will be controlled by a player."
|
||||||
|
icon_state = "corgirune"
|
||||||
|
icon_state_opened = "corgirune-inert"
|
||||||
|
density = TRUE
|
||||||
|
ghost_query_type = /datum/ghost_query/corgi_rune
|
||||||
|
confirm_before_open = TRUE
|
||||||
|
|
||||||
|
/obj/structure/ghost_pod/manual/corgi/trigger()
|
||||||
|
..()
|
||||||
|
visible_message("<span class='warning'>\The [usr] places their hand on the rune!</span>")
|
||||||
|
log_and_message_admins("is attempting to summon a corgi.")
|
||||||
|
|
||||||
|
/obj/structure/ghost_pod/manual/corgi/create_occupant(var/mob/M)
|
||||||
|
density = FALSE
|
||||||
|
var/mob/living/simple_animal/corgi/R = new(get_turf(src))
|
||||||
|
if(M.mind)
|
||||||
|
M.mind.transfer_to(R)
|
||||||
|
to_chat(M, "<span class='notice'>You are a <b>Corgi</b>! Woof!</span>")
|
||||||
|
R.ckey = M.ckey
|
||||||
|
visible_message("<span class='warning'>With a bright flash of light, \the [src] disappears, and in its place stands a small corgi.</span>")
|
||||||
|
log_and_message_admins("successfully touched \a [src] and summoned a corgi.")
|
||||||
..()
|
..()
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 101 KiB |
@@ -1,10 +1,10 @@
|
|||||||
"a" = (/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"a" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"b" = (/obj/structure/plushie/ian,/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"b" = (/obj/structure/plushie/ian,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"c" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"c" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"d" = (/obj/structure/plushie/ian{dir = 8},/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"d" = (/obj/structure/plushie/ian{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"e" = (/obj/structure/plushie/ian{dir = 4},/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"e" = (/obj/structure/plushie/ian{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"f" = (/obj/effect/rune,/obj/item/weapon/deck/tarot,/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"f" = (/obj/structure/ghost_pod/manual/corgi,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
"g" = (/obj/structure/plushie/ian{dir = 1},/turf/simulated/mineral/floor,/area/submap/CorgiRitual)
|
"g" = (/obj/structure/plushie/ian{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual)
|
||||||
|
|
||||||
(1,1,1) = {"
|
(1,1,1) = {"
|
||||||
aabaa
|
aabaa
|
||||||
|
|||||||
Reference in New Issue
Block a user