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

The One Where I Port Modals

Browse Source
This commit is contained in:
Chompstation Bot
2021-06-30 19:29:34 +00:00
parent 2457a62edd
commit b6e1989a01
468 changed files with 10519 additions and 1808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/toys/godfigures.dm
View File

@@ -48,7 +48,7 @@
options["Moon Gem"] = "moon"
options["Tajaran Figure"] = "catrobe"
var/choice = input(M,"Choose your icon!","Customize Figure") in options
var/choice = tgui_input_list(M, "Choose your icon!", "Customize Figure", options)
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
if(options[choice] == "frobe")
@@ -123,7 +123,7 @@
var/mob/M = usr
if(!M.mind) return 0
var/input = sanitizeSafe(input("What do you want to name the icon?", ,""), MAX_NAME_LEN)
var/input = sanitizeSafe(input(usr, "What do you want to name the icon?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
name = "icon of " + input

4
code/game/objects/items/toys/toys.dm
View File

@@ -320,7 +320,7 @@
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(alert("Are you sure you want to recolor your blade?", "Confirm Recolor", "Yes", "No") == "Yes")
if(tgui_alert(usr, "Are you sure you want to recolor your blade?", "Confirm Recolor", list("Yes", "No")) == "Yes")
var/energy_color_input = input(usr,"","Choose Energy Color",lcolor) as color|null
if(energy_color_input)
lcolor = sanitize_hexcolor(energy_color_input)
@@ -897,7 +897,7 @@
if(!M.mind)
return 0
var/input = sanitizeSafe(input("What do you want to name the plushie?", ,""), MAX_NAME_LEN)
var/input = sanitizeSafe(input(usr, "What do you want to name the plushie?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
name = input

2
code/game/objects/items/toys/toys_vr.dm
View File

@@ -298,7 +298,7 @@
/obj/item/toy/rock/attackby(obj/item/I as obj, mob/living/user as mob, proximity)
if(!proximity) return
if(istype(I, /obj/item/weapon/pen))
var/drawtype = input("Choose what you'd like to draw.", "Faces") in list("fred","roxie","rock")
var/drawtype = tgui_alert(user, "Choose what you'd like to draw.", "Faces", list("fred","roxie","rock","Cancel"))
switch(drawtype)
if("fred")
src.icon_state = "fred"