cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10764

Browse Source
This commit is contained in:
Razgriz
2021-07-03 00:26:13 -07:00
committed by GitHub
parent 014db9fbe5 b87afdb3d5
commit e3a9cd3775
524 changed files with 3995 additions and 3056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsign.dm
+1 -1
View File
@@ -36,7 +36,7 @@
var/obj/item/weapon/card/id/card = I.GetID()
if(istype(card))
if(access_bar in card.GetAccess())
var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0)
var/sign_type = tgui_input_list(user, "What would you like to change the barsign to?", "Bar Sign Choice", get_valid_states(0))
if(!sign_type)
return
icon_state = sign_type
code/game/objects/structures/bonfire.dm
+1 -1
View File
@@ -47,7 +47,7 @@
/obj/structure/bonfire/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/rods) && !can_buckle && !grill)
var/obj/item/stack/rods/R = W
var/choice = input(user, "What would you like to construct?", "Bonfire") as null|anything in list("Stake","Grill")
var/choice = tgui_input_list(user, "What would you like to construct?", "Bonfire", list("Stake","Grill"))
switch(choice)
if("Stake")
R.use(1)
code/game/objects/structures/ghost_pods/event_vr.dm
+2 -2
View File
@@ -63,13 +63,13 @@
var/finalized = "No"
while(finalized == "No" && M.client)
choice = input(M,"What type of predator do you want to play as?") as null|anything in possible_mobs
choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", possible_mobs)
if(!choice)
randomize = TRUE
break
if(choice)
finalized = alert(M, "Are you sure you want to play as [choice]? By clicking yes you should expect to be treated as vore predator and possibly killed. Do not attack other players. You will have minimal OOC pref protections.","Confirmation","No","Yes")
finalized = tgui_alert(M, "Are you sure you want to play as [choice]?","Confirmation",list("No","Yes"))
if(randomize)
choice = pick(possible_mobs)
code/game/objects/structures/ghost_pods/ghost_pods.dm
+2 -2
View File
@@ -50,7 +50,7 @@
/obj/structure/ghost_pod/manual/attack_hand(var/mob/living/user)
if(!used)
if(confirm_before_open)
if(alert(user, "Are you sure you want to touch \the [src]?", "Confirm", "No", "Yes") == "No")
if(tgui_alert(user, "Are you sure you want to touch \the [src]?", "Confirm", list("No", "Yes")) == "No")
return
trigger()
// VOREStation Addition Start
@@ -87,7 +87,7 @@
to_chat(user, "<span class='warning'>Another spirit appears to have gotten to \the [src] before you. Sorry.</span>")
return
var/choice = input(user, "Are you certain you wish to activate this pod?", "Control Pod") as null|anything in list("Yes", "No")
var/choice = tgui_alert(user, "Are you certain you wish to activate this pod?", "Control Pod", list("Yes", "No"))
if(!choice || choice == "No")
return
code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
+1 -1
View File
@@ -23,7 +23,7 @@
return
busy = TRUE
var/choice = input(user, "Are you certain you wish to activate this pod?", "Control Pod") as null|anything in list("Yes", "No")
var/choice = tgui_alert(user, "Are you certain you wish to activate this pod?", "Control Pod", list("Yes", "No"))
if(!choice || choice == "No")
busy = FALSE
code/game/objects/structures/ghost_pods/silicon_vr.dm
+1 -1
View File
@@ -2,7 +2,7 @@
remains_active = TRUE
/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(var/mob/M)
var/response = alert(M, "What type of lost drone are you? Do note, that dogborgs may have experienced different type of corruption ((High potential for having vore-related laws))", "Drone Type", "Regular", "Dogborg")
var/response = tgui_alert(M, "What type of lost drone are you? Do note, that dogborgs may have experienced different type of corruption ((High potential for having vore-related laws))", "Drone Type", list("Regular", "Dogborg"))
if(!(response == "Dogborg")) // No response somehow or Regular
return ..()
else
code/game/objects/structures/kitchen_foodcart_vr.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/structure/foodcart/attack_hand(var/mob/user as mob)
if(contents.len)
var/obj/item/weapon/reagent_containers/food/choice = input("What would you like to grab from the cart?") as null|obj in contents
var/obj/item/weapon/reagent_containers/food/choice = tgui_input_list(usr, "What would you like to grab from the cart?", "Grab Choice", contents)
if(choice)
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
return
code/game/objects/structures/medical_stand_vr.dm
+3 -3
View File
@@ -107,7 +107,7 @@
var/action_type
if(available_options.len > 1)
action_type = input(usr, "What do you want to attach/detach?") as null|anything in available_options
action_type = tgui_input_list(usr, "What do you want to attach/detach?", "Attach/Detach Choice", available_options)
else if(available_options.len)
action_type = available_options[1]
if(usr.stat == DEAD || !CanMouseDrop(target))
@@ -175,7 +175,7 @@
var/action_type
if(available_options.len > 1)
action_type = input(user, "What do you want to do?") as null|anything in available_options
action_type = tgui_input_list(user, "What do you want to do?", "Stand Choice", available_options)
else if(available_options.len)
action_type = available_options[1]
switch (action_type)
@@ -240,7 +240,7 @@
set name = "Set IV transfer amount"
set category = "Object"
set src in range(1)
var/N = input("Amount per transfer from this:","[src]") as null|anything in transfer_amounts
var/N = tgui_input_list(usr, "Amount per transfer from this:","[src]", transfer_amounts)
if(N)
transfer_amount = N
code/game/objects/structures/mirror.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
if(istype(get_area(src),/area/syndicate_mothership))
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != SPECIES_VOX && is_alien_whitelisted(user, SPECIES_VOX))
var/choice = input("Do you wish to become a true Vox of the Shoal? This is not reversible.") as null|anything in list("No","Yes")
var/choice = tgui_alert(usr, "Do you wish to become a true Vox of the Shoal? This is not reversible.", "Become Vox?", list("No","Yes"))
if(choice && choice == "Yes")
var/mob/living/carbon/human/vox/vox = new(get_turf(src),SPECIES_VOX)
vox.gender = user.gender
code/game/objects/structures/props/beam_prism.dm
+7 -7
View File
@@ -50,7 +50,7 @@
to_chat(user, "<span class='warning'>\The [src]'s motors resist your efforts to rotate it. You may need to find some form of controller.</span>")
return
var/confirm = input("Do you want to try to rotate \the [src]?", "[name]") in list("Yes", "No")
var/confirm = tgui_alert(usr, "Do you want to try to rotate \the [src]?", "[name]", list("Yes", "No"))
if(confirm == "No")
visible_message(\
"<span class='notice'>[user.name] decides not to try turning \the [src].</span>",\
@@ -59,13 +59,13 @@
var/new_bearing
if(free_rotate)
new_bearing = input("What bearing do you want to rotate \the [src] to?", "[name]") as num
new_bearing = input(usr, "What bearing do you want to rotate \the [src] to?", "[name]") as num
new_bearing = round(new_bearing)
if(new_bearing <= -1 || new_bearing > 360)
to_chat(user, "<span class='warning'>Rotating \the [src] [new_bearing] degrees would be a waste of time.</span>")
return
else
var/choice = input("What point do you want to set \the [src] to?", "[name]") as null|anything in compass_directions
var/choice = tgui_input_list(usr, "What point do you want to set \the [src] to?", "[name]", compass_directions)
new_bearing = round(compass_directions[choice])
var/rotate_degrees = new_bearing - degrees_from_north
@@ -156,7 +156,7 @@
/obj/structure/prop/prismcontrol/attack_hand(mob/living/user)
..()
var/confirm = input("Do you want to try to rotate \the [src]?", "[name]") in list("Yes", "No")
var/confirm = tgui_alert(usr, "Do you want to try to rotate \the [src]?", "[name]", list("Yes", "No"))
if(confirm == "No")
visible_message(\
"<span class='notice'>[user.name] decides not to try turning \the [src].</span>",\
@@ -176,16 +176,16 @@
var/new_bearing
if(free_rotate)
new_bearing = input("What bearing do you want to rotate \the [src] to?", "[name]") as num
new_bearing = input(usr, "What bearing do you want to rotate \the [src] to?", "[name]") as num
new_bearing = round(new_bearing)
if(new_bearing <= -1 || new_bearing > 360)
to_chat(user, "<span class='warning'>Rotating \the [src] [new_bearing] degrees would be a waste of time.</span>")
return
else
var/choice = input("What point do you want to set \the [src] to?", "[name]") as null|anything in compass_directions
var/choice = tgui_input_list(usr, "What point do you want to set \the [src] to?", "[name]", compass_directions)
new_bearing = round(compass_directions[choice])
confirm = input("Are you certain you want to rotate \the [src]?", "[name]") in list("Yes", "No")
confirm = tgui_alert(usr, "Are you certain you want to rotate \the [src]?", "[name]", list("Yes", "No"))
if(confirm == "No")
visible_message(\
"<span class='notice'>[user.name] decides not to try turning \the [src].</span>",\
code/game/objects/structures/signs.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
if(tool.is_screwdriver() && isturf(user.loc))
var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
var/direction = tgui_input_list(usr, "In which direction?", "Select direction.", list("North", "East", "South", "West", "Cancel"))
if(direction == "Cancel") return
var/obj/structure/sign/S = new(user.loc)
switch(direction)
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -69,13 +69,13 @@
var/mob/living/L = user
//They're in it, and want to get out.
if(L.loc == src)
var/choice = alert("Do you want to exit \the [src]?","Un-Hide?","Exit","Stay")
var/choice = tgui_alert(usr, "Do you want to exit \the [src]?","Un-Hide?",list("Exit","Stay"))
if(choice == "Exit")
if(L == hider)
hider = null
L.forceMove(get_turf(src))
else if(!hider)
var/choice = alert("Do you want to hide in \the [src]?","Un-Hide?","Hide","Stay")
var/choice = tgui_alert(usr, "Do you want to hide in \the [src]?","Un-Hide?",list("Hide","Stay"))
if(choice == "Hide" && !hider) //Check again because PROMPT
L.forceMove(src)
hider = L
code/game/objects/structures/under_wardrobe.dm
+1 -1
View File
@@ -66,7 +66,7 @@
var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]]
if(!UWC)
return
var/datum/category_item/underwear/selected_underwear = input(H, "Choose underwear:", "Choose underwear", H.all_underwear[UWC.name]) as null|anything in UWC.items
var/datum/category_item/underwear/selected_underwear = tgui_input_list(H, "Choose underwear:", "Choose underwear", UWC.items, H.all_underwear[UWC.name])
if(selected_underwear && CanUseTopic(H, GLOB.tgui_default_state))
H.all_underwear[UWC.name] = selected_underwear
H.hide_underwear[UWC.name] = FALSE
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -170,7 +170,7 @@
if(I.type == /obj/item/device/analyzer)
to_chat(user, "<span class='notice'>The water temperature seems to be [watertemp].</span>")
if(I.is_wrench())
var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings
var/newtemp = tgui_input_list(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve", temperature_settings)
to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I].</span>")
playsound(src, I.usesound, 50, 1)
if(do_after(user, 50 * I.toolspeed))