cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove old inputs (#17008)

Browse Source
This commit is contained in:
Kashargul
2025-02-01 14:23:25 -05:00
committed by GitHub
parent de67cc1f74
commit bbed406b2e
63 changed files with 151 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+17 -9
View File
@@ -60,12 +60,16 @@
colourName = "rainbow"
uses = 0
/obj/item/pen/crayon/rainbow/attack_self(mob/living/user as mob)
colour = input(user, "Please select the main colour.", "Crayon colour") as color
shadeColour = input(user, "Please select the shade colour.", "Crayon colour") as color
/obj/item/pen/crayon/rainbow/attack_self(mob/living/user)
var/new_colour = tgui_color_picker(user, "Please select the main colour.", "Crayon colour", colour)
if(new_colour)
colour = new_colour
new_colour = tgui_color_picker(user, "Please select the shade colour.", "Crayon shade colour", shadeColour)
if(new_colour)
shadeColour = new_colour
return
/obj/item/pen/crayon/afterattack(atom/target, mob/user as mob, proximity)
/obj/item/pen/crayon/afterattack(atom/target, mob/user, proximity)
if(!proximity) return
if(istype(target,/turf/simulated/floor))
var/drawtype = tgui_input_list(user, "Choose what you'd like to draw.", "Crayon scribbles", list("graffiti","rune","letter","arrow"))
@@ -174,7 +178,7 @@
colourName = "mime"
uses = 0
/obj/item/pen/crayon/marker/mime/attack_self(mob/living/user as mob) //inversion
/obj/item/pen/crayon/marker/mime/attack_self(mob/living/user) //inversion
if(colour != "#FFFFFF" && shadeColour != "#000000")
colour = "#FFFFFF"
shadeColour = "#000000"
@@ -192,12 +196,16 @@
colourName = "rainbow"
uses = 0
/obj/item/pen/crayon/marker/rainbow/attack_self(mob/living/user as mob)
colour = input(user, "Please select the main colour.", "Marker colour") as color
shadeColour = input(user, "Please select the shade colour.", "Marker colour") as color
/obj/item/pen/crayon/marker/rainbow/attack_self(mob/living/user)
var/new_colour = tgui_color_picker(user, "Please select the main colour.", "Marker colour", colour)
if(new_colour)
colour = new_colour
new_colour = tgui_color_picker(user, "Please select the shade colour.", "Marker colour", shadeColour)
if(new_colour)
shadeColour = new_colour
return
/obj/item/pen/crayon/marker/attack(mob/living/M as mob, mob/living/user as mob)
/obj/item/pen/crayon/marker/attack(mob/living/M, mob/living/user)
if(M == user)
to_chat(user, "You take a bite of the marker and swallow it.")
user.nutrition += 1
code/game/objects/items/devices/text_to_speech.dm
+3 -1
View File
@@ -17,7 +17,9 @@
desc = "[initial(desc)] This one is assigned to [user.real_name]."
named = 1
/* //Another way of naming the device. Gives more freedom, but could lead to issues.
device_name = copytext(sanitize(input(user, "What would you like to name your device? You must input a name before the device can be used.", "Name your device", "") as null|text),1,MAX_NAME_LEN)
device_name = sanitize(tgui_input_text(user, "What would you like to name your device? You must input a name before the device can be used.", "Name your device", "", MAX_NAME_LEN))
if(!device_name)
return
name = "[initial(name)] - [device_name]"
named = 1
*/