cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 17:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Staying up to date.

Browse Source
This commit is contained in:
KasparoVy
2016-07-28 17:02:07 -04:00
parent 861d873fac ce77a40e9b
commit 39d3d64207
276 changed files with 10447 additions and 11662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_general.dm
+33 -1
View File
@@ -29,7 +29,7 @@
/datum/gear/sechud
display_name = "a classic security HUD"
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent")
/datum/gear/matches
display_name = "a box of matches"
@@ -38,3 +38,35 @@
/datum/gear/cards
display_name = "a deck of cards"
path = /obj/item/toy/cards/deck
/datum/gear/blackbandana
display_name = "bandana, black"
path = /obj/item/clothing/mask/bandana/black
/datum/gear/purplebandana
display_name = "bandana, purple"
path = /obj/item/clothing/mask/bandana/purple
/datum/gear/orangebandana
display_name = "bandana, orange"
path = /obj/item/clothing/mask/bandana/orange
/datum/gear/greenbandana
display_name = "bandana, green"
path = /obj/item/clothing/mask/bandana/green
/datum/gear/bluebandana
display_name = "bandana, blue"
path = /obj/item/clothing/mask/bandana/blue
/datum/gear/redbandana
display_name = "bandana, red"
path = /obj/item/clothing/mask/bandana/red
/datum/gear/goldbandana
display_name = "bandana, gold"
path = /obj/item/clothing/mask/bandana/gold
/datum/gear/skullbandana
display_name = "bandana, skull"
path = /obj/item/clothing/mask/bandana/skull
code/modules/client/preference/loadout/loadout_shoes.dm
+12 -2
View File
@@ -4,5 +4,15 @@
sort_category = "Shoes"
/datum/gear/shoes/sandals
display_name = "sandals"
path = /obj/item/clothing/shoes/sandal
display_name = "sandals, wooden"
path = /obj/item/clothing/shoes/sandal
/datum/gear/shoes/fancysandals
display_name = "sandals, fancy"
cost = 5
path = /obj/item/clothing/shoes/sandal/fancy
/datum/gear/shoes/dressshoes
display_name = "dress shoes"
cost = 5
path = /obj/item/clothing/shoes/centcom
code/modules/client/preference/loadout/loadout_suit.dm
+15 -1
View File
@@ -59,7 +59,7 @@
/datum/gear/suit/coat/job/miner
display_name = "winter coat, miner"
path = /obj/item/clothing/suit/hooded/wintercoat/miner
allowed_roles = list("Miner")
allowed_roles = list("Shaft Miner")
//LABCOATS
/datum/gear/suit/labcoat_emt
@@ -144,3 +144,17 @@
/datum/gear/suit/blackhoodie
display_name = "hoodie, black"
path = /obj/item/clothing/suit/hooded/hoodie
//SUITS!
/datum/gear/suit/blacksuit
display_name = "suit jacket, black"
path = /obj/item/clothing/suit/storage/lawyer/blackjacket
/datum/gear/suit/bluesuit
display_name = "suit jacket, blue"
path = /obj/item/clothing/suit/storage/lawyer/bluejacket
/datum/gear/suit/purplesuit
display_name = "suit jacket, purple"
path = /obj/item/clothing/suit/storage/lawyer/purpjacket
code/modules/client/preference/loadout/loadout_uniform.dm
+3 -3
View File
@@ -66,7 +66,7 @@
/datum/gear/uniform/skirt/job/med
display_name = "skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Brig Physician")
/datum/gear/uniform/skirt/job/sci
display_name = "skirt, scientist"
@@ -106,8 +106,8 @@
path = /obj/item/clothing/under/rank/security/formal
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
datum/gear/uniform/secorporate
display_name = "security uniform, corporate "
/datum/gear/uniform/sec/secorporate
display_name = "security uniform, corporate"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
code/modules/client/preference/preferences.dm
+22 -1
View File
@@ -93,6 +93,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/show_ghostitem_attack = TRUE
var/UI_style_color = "#ffffff"
var/UI_style_alpha = 255
var/space_parallax = 1
var/space_dust = 1
var/parallax_speed = 1
//character preferences
@@ -416,6 +419,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(TAB_GAME) // General Preferences
dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<h2>General Settings</h2>"
dat += "<b>Space Parallax:</b> <a href='?_src_=prefs;preference=parallax'><b>[space_parallax ? "Enabled" : "Disabled"]</b></a><br>"
dat += "<b>Parallax Speed:</b> <a href='?_src_=prefs;preference=p_speed'><b>[parallax_speed]</b></a><br>"
dat += "<b>Space Dust:</b> <a href='?_src_=prefs;preference=dust'><b>[space_dust ? "Yes" : "No"]</b></a><br>"
dat += "<b>Fancy NanoUI:</b> <a href='?_src_=prefs;preference=nanoui'>[(nanoui_fancy) ? "Yes" : "No"]</a><br>"
dat += "<b>Ghost-Item Attack Animation:</b> <a href='?_src_=prefs;preference=ghost_att_anim'>[(show_ghostitem_attack) ? "Yes" : "No"]</a><br>"
dat += "<b>Custom UI settings:</b><br>"
@@ -1934,6 +1940,21 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/mob/living/carbon/human/H = usr
H.remake_hud()
if("parallax")
space_parallax = !space_parallax
if(usr && usr.hud_used)
usr.hud_used.update_parallax_and_dust()
if("dust")
space_dust = !space_dust
if(usr && usr.hud_used)
usr.hud_used.update_parallax_and_dust()
if("p_speed")
parallax_speed = min(max(input(user, "Enter a number between 0 and 5 included (default=2)","Parallax Speed Preferences",parallax_speed),0),5)
if("be_special")
var/r = href_list["role"]
if(!(r in special_roles))
@@ -2204,4 +2225,4 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
popup.open(0)
/datum/preferences/proc/close_load_dialog(mob/user)
user << browse(null, "window=saves")
user << browse(null, "window=saves")
code/modules/client/preference/preferences_mysql.dm
+14 -2
View File
@@ -13,7 +13,10 @@
volume,
nanoui_fancy,
show_ghostitem_attack,
lastchangelog
lastchangelog,
space_parallax,
space_dust,
parallax_speed
FROM [format_table_name("player")]
WHERE ckey='[C.ckey]'"}
)
@@ -40,6 +43,9 @@
nanoui_fancy = text2num(query.item[11])
show_ghostitem_attack = text2num(query.item[12])
lastchangelog = query.item[13]
space_parallax = text2num(query.item[14])
space_dust = text2num(query.item[15])
parallax_speed = text2num(query.item[16])
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -54,6 +60,9 @@
nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
space_parallax = sanitize_integer(space_parallax, 0, 1, initial(space_parallax))
space_dust = sanitize_integer(space_dust, 0, 1, initial(space_dust))
parallax_speed = sanitize_integer(parallax_speed, 0, 5, initial(parallax_speed))
return 1
/datum/preferences/proc/save_preferences(client/C)
@@ -78,7 +87,10 @@
volume='[volume]',
nanoui_fancy='[nanoui_fancy]',
show_ghostitem_attack='[show_ghostitem_attack]',
lastchangelog='[lastchangelog]'
lastchangelog='[lastchangelog]',
space_parallax='[space_parallax]',
space_dust='[space_dust]',
parallax_speed='[parallax_speed]'
WHERE ckey='[C.ckey]'"}
)
code/modules/client/preference/preferences_toggles.dm
+42 -1
View File
@@ -213,4 +213,45 @@
set category = "Preferences"
set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
prefs.current_tab = 1
prefs.ShowChoices(usr)
prefs.ShowChoices(usr)
/client/verb/toggle_space_parallax()
set name = "Toggle Space Parallax"
set category = "Preferences"
set desc = "Toggle the parallax effect of space turfs."
prefs.space_parallax = !prefs.space_parallax
prefs.save_preferences(src)
if(!prefs.space_parallax)
to_chat(usr, "Space parallax is now deactivated.")
else
to_chat(usr, "Space parallax is now activated.")
if(mob && mob.hud_used)
mob.hud_used.update_parallax_and_dust()
/client/verb/toggle_space_dust()
set name = "Toggle Space Dust"
set category = "Preferences"
set desc = "Toggle the presence of dust on space turfs."
prefs.space_dust = !prefs.space_dust
prefs.save_preferences(src)
if(!prefs.space_dust)
to_chat(usr, "Space dust is now deactivated.")
else
to_chat(usr, "Space dust is now activated.")
if(mob && mob.hud_used)
mob.hud_used.update_parallax_and_dust()
/client/verb/toggle_parallax_speed()
set name = "Change Parallax Speed"
set category = "Preferences"
set desc = "Change the speed at which parallax moves."
prefs.parallax_speed = min(max(input(usr, "Enter a number between 0 and 5 included (default=2)","Parallax Speed Preferences",prefs.parallax_speed),0),5)
prefs.save_preferences(src)