cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Loadout fix and virus immunity additions (#1804)

Browse Source 
-changed some things on the tweak path loadout to avoid runtimes
-fixed some species being affected by virus when they should be immune to them
-fixed being able to miss when firing point blank
-tweaks a bit more the corporate safe contents
-moves some clothing objects to the proper place and fixes some names
This commit is contained in:
Alberyk
2017-02-24 19:12:16 +02:00
committed by skull132
parent 9a2445dc69
commit 54b64c3688
27 changed files with 159 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+17 -48
View File
@@ -14,36 +14,7 @@
return
/*
Color adjustment
*/
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
/datum/gear_tweak/color
var/list/valid_colors
/datum/gear_tweak/color/New(var/list/valid_colors)
src.valid_colors = valid_colors
..()
/datum/gear_tweak/color/get_contents(var/metadata)
return "Color: <font color='[metadata]'>&#9899;</font>"
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
if(valid_colors)
return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
if(valid_colors && !(metadata in valid_colors))
return
I.color = metadata
/*
Path adjustment
* Path adjustment
*/
/datum/gear_tweak/path
@@ -54,7 +25,7 @@ Path adjustment
..()
/datum/gear_tweak/path/get_contents(var/metadata)
return "Type: [metadata]"
return "(Type: [metadata])"
/datum/gear_tweak/path/get_default()
return valid_paths[1]
@@ -68,28 +39,27 @@ Path adjustment
gear_data.path = valid_paths[metadata]
/*
Content adjustment
* Content adjustment
*/
/datum/gear_tweak/contents
var/list/valid_contents
/datum/gear_tweak/contents/New()
valid_contents = args.Copy()
valid_contents = args
..()
/datum/gear_tweak/contents/get_contents(var/metadata)
return "Contents: [english_list(metadata, and_text = ", ")]"
return "(Contents)"
/datum/gear_tweak/contents/get_default()
. = list()
for(var/i = 1 to valid_contents.len)
. += "Random"
var/list/contents = valid_contents[i]
. += contents[1]
/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
. = list()
for(var/i = metadata.len to (valid_contents.len - 1))
metadata += "Random"
for(var/i = 1 to valid_contents.len)
var/entry = input(user, "Choose an entry.", "Character Preference", metadata[i]) as null|anything in (valid_contents[i] + list("Random", "None"))
if(entry)
@@ -101,17 +71,16 @@ Content adjustment
if(metadata.len != valid_contents.len)
return
for(var/i = 1 to valid_contents.len)
var/path
var/list/contents = valid_contents[i]
if(metadata[i] == "Random")
path = pick(contents)
path = contents[path]
else if(metadata[i] == "None")
continue
else
path = contents[metadata[i]]
new path(I)
var/path = contents[metadata[i]]
if(path)
if(path == "Random")
path = pick(contents)
path = contents[path]
else if(path == "None")
continue
new path(I)
/*
Reagents adjustment
*/
@@ -142,4 +111,4 @@ Reagents adjustment
. = valid_reagents[pick(valid_reagents)]
else
. = valid_reagents[metadata]
I.reagents.add_reagent(., I.reagents.get_free_space())
I.reagents.add_reagent(., I.reagents.get_free_space())