cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

conflicts

Browse Source
This commit is contained in:
FreeStylaLT
2020-05-24 12:47:18 +03:00
parent 6edc58a1df 18f21c14c7
commit 387e018b18
2089 changed files with 205788 additions and 204738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/gear_tweaks.dm
+1 -2
View File
@@ -16,8 +16,7 @@
/*
* Color adjustment
*/
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
/datum/gear_tweak/color
var/list/valid_colors
code/modules/client/preference/loadout/loadout.dm
+10 -10
View File
@@ -1,5 +1,5 @@
var/list/loadout_categories = list()
var/list/gear_datums = list()
GLOBAL_LIST_EMPTY(loadout_categories)
GLOBAL_LIST_EMPTY(gear_datums)
/datum/loadout_category
var/category = ""
@@ -30,15 +30,15 @@ var/list/gear_datums = list()
error("Loadout - Missing path definition: [G]")
continue
if(!loadout_categories[use_category])
loadout_categories[use_category] = new /datum/loadout_category(use_category)
var/datum/loadout_category/LC = loadout_categories[use_category]
gear_datums[use_name] = new geartype
LC.gear[use_name] = gear_datums[use_name]
if(!GLOB.loadout_categories[use_category])
GLOB.loadout_categories[use_category] = new /datum/loadout_category(use_category)
var/datum/loadout_category/LC = GLOB.loadout_categories[use_category]
GLOB.gear_datums[use_name] = new geartype
LC.gear[use_name] = GLOB.gear_datums[use_name]
loadout_categories = sortAssoc(loadout_categories)
for(var/loadout_category in loadout_categories)
var/datum/loadout_category/LC = loadout_categories[loadout_category]
GLOB.loadout_categories = sortAssoc(GLOB.loadout_categories)
for(var/loadout_category in GLOB.loadout_categories)
var/datum/loadout_category/LC = GLOB.loadout_categories[loadout_category]
LC.gear = sortAssoc(LC.gear)
return 1
code/modules/client/preference/loadout/loadout_cosmetics.dm
+1 -1
View File
@@ -21,4 +21,4 @@
/datum/gear/lipstick/lime
display_name = "lipstick, lime"
path = /obj/item/lipstick/lime
path = /obj/item/lipstick/lime
code/modules/client/preference/loadout/loadout_donor.dm
+1 -1
View File
@@ -93,4 +93,4 @@
display_name = "Gold ID Decal"
path = /obj/item/id_decal/gold
donator_tier = 4
cost = 4
cost = 4
code/modules/client/preference/loadout/loadout_general.dm
+2 -2
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", "Internal Affairs Agent")
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent","Magistrate")
/datum/gear/matches
display_name = "a box of matches"
@@ -42,7 +42,7 @@
/datum/gear/doublecards
display_name = "a double deck of standard cards"
path = /obj/item/deck/doublecards
/datum/gear/tarot
display_name = "a deck of tarot cards"
path = /obj/item/deck/tarot
code/modules/client/preference/loadout/loadout_glasses.dm
+1 -1
View File
@@ -21,4 +21,4 @@
/datum/gear/glasses/prescription
display_name = "Prescription glasses"
path = /obj/item/clothing/glasses/regular
path = /obj/item/clothing/glasses/regular
code/modules/client/preference/loadout/loadout_gloves.dm
+1 -1
View File
@@ -5,4 +5,4 @@
/datum/gear/gloves/fingerless
display_name = "Fingerless Gloves"
path = /obj/item/clothing/gloves/fingerless
path = /obj/item/clothing/gloves/fingerless
code/modules/client/preference/loadout/loadout_shoes.dm
+1 -1
View File
@@ -55,4 +55,4 @@
/datum/gear/shoes/whiteshoes
display_name = "White shoes"
path = /obj/item/clothing/shoes/white
path = /obj/item/clothing/shoes/white