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

Merge branch 'master' into Icons/guns

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-01 11:04:34 -04:00
committed by GitHub
parent a10f436f3b 7744a7d5cf
commit 99874850ba
522 changed files with 4523 additions and 3586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -68,7 +68,7 @@
set category = "Object"
set src in view(1)
var/genemask = input("Choose a gene to modify.") as null|anything in SSplants.plant_gene_datums
var/genemask = tgui_input_list(usr, "Choose a gene to modify.", "Gene Choice", SSplants.plant_gene_datums)
if(!genemask)
return
code/modules/projectiles/guns/launcher/pneumatic.dm
+1 -1
View File
@@ -32,7 +32,7 @@
set name = "Set Valve Pressure"
set category = "Object"
set src in range(0)
var/N = input("Percentage of tank used per shot:","[src]") as null|anything in possible_pressure_amounts
var/N = tgui_input_list(usr, "Percentage of tank used per shot:","[src]", possible_pressure_amounts)
if (N)
pressure_setting = N
to_chat(usr, "You dial the pressure valve to [pressure_setting]%.")
code/modules/projectiles/guns/projectile/pistol.dm
+2 -2
View File
@@ -38,7 +38,7 @@
to_chat(M, "<span class='notice'>You don't feel cool enough to name this gun, chump.</span>")
return 0
var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
name = input
@@ -61,7 +61,7 @@
options["Jindal T15 Chooha"] = "p08"
options["Jindal KP-45W"] = "p08b"
options["PCA-11 Tenzu"] = "enforcer_black"
var/choice = input(M,"Choose your sprite!","Resprite Gun") in options
var/choice = tgui_input_list(M,"Choose your sprite!","Resprite Gun", options)
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
unique_reskin = options[choice]
code/modules/projectiles/guns/projectile/revolver.dm
+3 -3
View File
@@ -64,7 +64,7 @@
to_chat(M, "<span class='notice'>You don't feel cool enough to name this gun, chump.</span>")
return 0
var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
name = input
@@ -93,7 +93,7 @@
to_chat(M, "<span class='notice'>You don't feel cool enough to name this gun, chump.</span>")
return 0
var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
name = input
@@ -116,7 +116,7 @@
options["H-H Sindri"] = "webley"
options["Lombardi Buzzard"] = "detective_buzzard"
options["Lombardi Constable Deluxe 2502"] = "detective_constable"
var/choice = input(M,"Choose your sprite!","Resprite Gun") in options
var/choice = tgui_input_list(M,"Choose your sprite!","Resprite Gun", options)
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
to_chat(M, "Your gun is now sprited as [choice]. Say hello to your new friend.")