cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix ghost role free slot spawns (#11840)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-18 20:23:32 -07:00
committed by GitHub
parent e6ae743646
commit 05f9a24e8f
7 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/structures/ghost_pods/event_vr.dm
View File

@@ -13,7 +13,6 @@
anchored = TRUE
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
var/announce_prob = 35
/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)
..()
@@ -65,9 +64,6 @@
newPred.vore_selected = newPred.vore_organs[1]
qdel(src)
/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce
announce_prob = 0
/obj/structure/ghost_pod/ghost_activated/morphspawn
name = "weird goo"
desc = "A pile of weird gunk... Wait, is it actually moving?"
@@ -78,7 +74,6 @@
anchored = TRUE
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
var/announce_prob = 50
/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
..()
@@ -109,13 +104,9 @@
newMorph.vore_selected = newMorph.vore_organs[1]
qdel(src)
/obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce
announce_prob = 0
/obj/structure/ghost_pod/ghost_activated/maintpred/redgate //For ghostpods placed in the redgate that aren't spawned via an event
name = "creature hole"
desc = "Looks like some creature dug is hiding in the redgate..."
announce_prob = 0
icon_state = "redgate_hole"
icon_state_opened = "redgate_hole"

31
code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
View File

@@ -11,6 +11,9 @@
spawn_active = TRUE
var/redgate_restricted = FALSE
/obj/structure/ghost_pod/ghost_activated/unified_hole/create_occupant(mob/observer/dead/user)
attack_ghost(user)
//override the standard attack_ghost proc for custom messages
/obj/structure/ghost_pod/ghost_activated/unified_hole/attack_ghost(var/mob/observer/dead/user)
var/choice
@@ -20,7 +23,7 @@
//No OOC notes/FT
if(not_has_ooc_text(user))
//to_chat(user, span_warning("You must have proper out-of-character notes and flavor text configured for your current character slot to use this spawnpoint."))
to_chat(user, span_warning("You must have proper out-of-character notes and flavor text configured for your current character slot to use this spawnpoint."))
return
if(redgate_restricted)
@@ -28,19 +31,21 @@
else
choice = tgui_alert(user, "Which type of critter do you wish to spawn as?", "Critter Spawner", list("Mob", "Morph", "Lurker", "Cancel"))
if(choice == "Mob")
create_simplemob(user)
else if(choice == "Morph")
create_morph(user)
else if(choice == "Lurker")
if(!is_alien_whitelisted(user.client, GLOB.all_species[user.client.prefs.species]))
to_chat(user, span_warning("You cannot use this spawnpoint to spawn as a species you are not whitelisted for!"))
switch(choice)
if(null, "Cancel")
return
else
if("Mob")
create_simplemob(user)
if("Morph")
create_morph(user)
if("Lurker")
if(!is_alien_whitelisted(user.client, GLOB.all_species[user.client.prefs.species]))
to_chat(user, span_warning("You cannot use this spawnpoint to spawn as a species you are not whitelisted for!"))
return
create_lurker(user)
else if(choice == "Cancel")
return
used = TRUE
icon_state = icon_state_opened
GLOB.active_ghost_pods -= src
/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(var/mob/M)
var/choice
@@ -155,8 +160,8 @@
GLOB.active_ghost_pods += src
/obj/structure/ghost_pod/ghost_activated/unified_hole/Destroy()
. = ..()
GLOB.active_ghost_pods -= src
. = ..()
/obj/structure/ghost_pod/ghost_activated/unified_hole/redgate
name = "Redspace inhabitant hole"