mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] var/global/list -> GLOB. conversion (#11193)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6f8cbcf612
commit
2c9453b5c3
@@ -5,11 +5,11 @@
|
||||
var/link = "MOBSPAWN"
|
||||
|
||||
/obj/machinery/button/mob_spawner_button/attack_hand(mob/living/user)
|
||||
var/mob_wanted = tgui_input_list(user, "Which Mob do you want to spawn?", "Mob spawn", vr_mob_spawner_options)
|
||||
var/mob_wanted = tgui_input_list(user, "Which Mob do you want to spawn?", "Mob spawn", GLOB.vr_mob_spawner_options)
|
||||
if(!mob_wanted)
|
||||
return
|
||||
var/neutral = FALSE
|
||||
var/mobtype = vr_mob_spawner_options[mob_wanted]
|
||||
var/mobtype = GLOB.vr_mob_spawner_options[mob_wanted]
|
||||
var/faction = tgui_alert(user, "Do you want the mob's faction to remain the same or be passive?","Faction",list("Normal","Neutral"))
|
||||
if(!faction)
|
||||
return
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
var/user_vars_remembered //not needed for manual editing, just stores the original vars from the above list to make sure they go back to normal later
|
||||
|
||||
/obj/item/Destroy(force, ...)
|
||||
if(item_tf_spawn_allowed)
|
||||
item_tf_spawnpoints -= src
|
||||
user_vars_remembered = null
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
icon = 'icons/mob/pets.dmi'
|
||||
icon_state = "syndifox"
|
||||
chassis = "syndifox"
|
||||
possible_chassis = list("Fox"="syndifox")
|
||||
var/gut1 //Custom voregut temp vars
|
||||
var/gut2
|
||||
|
||||
@@ -188,7 +187,7 @@
|
||||
to_chat(usr,span_warning("You cannot join a pAI card when you are banned from playing as a pAI."))
|
||||
return
|
||||
|
||||
for(var/ourkey in paikeys)
|
||||
for(var/ourkey in GLOB.paikeys)
|
||||
if(ourkey == user.ckey)
|
||||
to_chat(usr, span_warning("You can't just rejoin any old pAI card!!! Your card still exists."))
|
||||
return
|
||||
@@ -210,7 +209,7 @@
|
||||
var/obj/item/paicard/flipper/card = new(location)
|
||||
var/mob/living/silicon/pai/flipper/new_pai = new(card)
|
||||
new_pai.key = user.key
|
||||
paikeys |= new_pai.ckey
|
||||
GLOB.paikeys |= new_pai.ckey
|
||||
card.setPersonality(new_pai)
|
||||
new_pai.SetName(actual_pai_name)
|
||||
|
||||
@@ -218,7 +217,7 @@
|
||||
var/obj/item/paicard/flipper/card = new(location)
|
||||
var/mob/living/silicon/pai/flipper/new_pai = new(card)
|
||||
new_pai.key = user.key
|
||||
paikeys |= new_pai.ckey
|
||||
GLOB.paikeys |= new_pai.ckey
|
||||
card.setPersonality(new_pai)
|
||||
if(!new_pai.savefile_load(new_pai))
|
||||
var/pai_name = "Vix"//tgui_input_text(new_pai, "Choose your character's name", "Character Name")
|
||||
@@ -235,11 +234,12 @@
|
||||
set name = "Choose Chassis"
|
||||
var/choice
|
||||
|
||||
choice = tgui_input_list(usr, "What would you like to use for your mobile chassis icon?", "Chassis Choice", possible_chassis)
|
||||
if(!choice) return
|
||||
choice = tgui_alert(src, "What would you like to use for your mobile chassis icon (Fox)?", "Chassis Choice", list("Yes", "No"))
|
||||
if(choice != "Yes")
|
||||
return
|
||||
var/oursize = size_multiplier
|
||||
resize(1, FALSE, TRUE, TRUE, FALSE) //We resize ourselves to normal here for a moment to let the vis_height get reset
|
||||
chassis = possible_chassis[choice]
|
||||
chassis = "syndifox"
|
||||
vore_capacity = 1
|
||||
vore_capacity_ex = list("stomach" = 1)
|
||||
resize(oursize, FALSE, TRUE, TRUE, FALSE) //And then back again now that we're sure the vis_height is correct.
|
||||
|
||||
Reference in New Issue
Block a user