cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ship_and_stuff

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
This commit is contained in:
alberyk
2022-03-04 14:00:19 -03:00
parent 93dd55a107 c41b6ee7ba
commit f0e32eec35
173 changed files with 1693 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout.dm
+15 -5
View File
@@ -65,13 +65,21 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
. = list()
var/mob/preference_mob = preference_mob()
var/list/whitelist_cache = list()
if(preference_mob)
for(var/species in global.all_species)
var/datum/species/S = global.all_species[species]
if(is_alien_whitelisted(preference_mob, S))
whitelist_cache += S.name
for(var/gear_name in gear_datums)
var/datum/gear/G = gear_datums[gear_name]
if(max_cost && G.cost > max_cost)
continue
if(G.whitelisted && preference_mob)
else if(G.whitelisted && whitelist_cache.len)
for(var/species in G.whitelisted)
if(is_alien_whitelisted(preference_mob, global.all_species[species]))
if(species in whitelist_cache)
. += gear_name
break
else
@@ -112,11 +120,12 @@ var/list/gear_datums = list()
if(!(gear_name in gear_datums))
pref.gear -= gear_name
var/total_cost = 0
var/list/player_valid_gear_choices = valid_gear_choices()
for(var/gear_name in pref.gear)
if(!gear_datums[gear_name])
to_chat(preference_mob, "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>")
pref.gear -= gear_name
else if(!(gear_name in valid_gear_choices()))
else if(!(gear_name in player_valid_gear_choices))
to_chat(preference_mob, "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species.</span>")
pref.gear -= gear_name
else
@@ -168,8 +177,9 @@ var/list/gear_datums = list()
. += "<tr><td colspan=3><hr></td></tr>"
. += "<tr><td colspan=3><b><center>[LC.category]</center></b></td></tr>"
. += "<tr><td colspan=3><hr></td></tr>"
var/list/player_valid_gear_choices = valid_gear_choices()
for(var/gear_name in LC.gear)
if(!(gear_name in valid_gear_choices()))
if(!(gear_name in player_valid_gear_choices))
continue
var/datum/gear/G = LC.gear[gear_name]
var/ticked = (G.display_name in pref.gear)
@@ -338,4 +348,4 @@ var/list/gear_datums = list()
/datum/gear/proc/check_species_whitelist(mob/living/carbon/human/H)
if(whitelisted && (!(H.species.name in whitelisted)))
return FALSE
return TRUE
return TRUE
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+1
View File
@@ -232,6 +232,7 @@
/datum/gear/accessory/silversun
display_name = "silversun floral shirt selection"
path = /obj/item/clothing/accessory/silversun
description = "A selection of Silversun floral shirts."
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/silversun/New()
code/modules/client/preference_setup/loadout/loadout_ears.dm
+12
View File
@@ -13,6 +13,18 @@
display_name = "headphones"
path = /obj/item/clothing/ears/earmuffs/headphones
/datum/gear/ears/double/earphones
display_name = "earphones selection"
description = "A selection of earphones."
path = /obj/item/clothing/ears/earmuffs/headphones/earphones
/datum/gear/ears/double/earphones/New()
..()
var/list/earphones = list()
earphones["earphones"] = /obj/item/clothing/ears/earmuffs/headphones/earphones
earphones["blue earphones"] = /obj/item/clothing/ears/earmuffs/headphones/earphones/blue
gear_tweaks += new /datum/gear_tweak/path(earphones)
/datum/gear/ears/earrings
display_name = "earring selection"
description = "A selection of eye-catching earrings."
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+1 -1
View File
@@ -45,7 +45,7 @@
display_name = "flash-proof sunglasses selection (Security/Command)"
description = "A selection of flash-proof sunglasses."
path = /obj/item/clothing/glasses/sunglasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Executive Officer", "Operations Manager", "Internal Affairs Agent", "Investigator", "Bridge Crew")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Executive Officer", "Operations Manager", "Investigator", "Bridge Crew")
/datum/gear/eyes/sunglasses/New()
..()
code/modules/client/preference_setup/loadout/loadout_general.dm
+15 -2
View File
@@ -48,7 +48,7 @@
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents())
/datum/gear/vacflask_cold
display_name = "cold vacuum-flask"
display_name = "cold vacuum flask"
path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask
/datum/gear/vacflask_cold/New()
@@ -62,7 +62,7 @@
spawned_flask.reagents.set_temperature(T0C + 5)
/datum/gear/vacflask_hot
display_name = "hot vacuum-flask"
display_name = "hot vacuum flask"
path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask
/datum/gear/vacflask_hot/New()
@@ -276,6 +276,19 @@
plushies["plushie, Aphy"] = /obj/item/toy/plushie/ipc
gear_tweaks += new /datum/gear_tweak/path(plushies)
/datum/gear/comic
display_name = "comic selection"
description = "A selection of comics and manga from across the Spur."
path = /obj/item/toy/comic
/datum/gear/comic/New()
..()
var/list/comics = list()
comics["comic book"] = /obj/item/toy/comic
comics["inspector 404 manga"] = /obj/item/toy/comic/inspector
comics["stormman manga"] = /obj/item/toy/comic/stormman
gear_tweaks += new /datum/gear_tweak/path(comics)
/datum/gear/toothpaste
display_name = "toothpaste and toothbrush"
path = /obj/item/storage/box/toothpaste
code/modules/client/preference_setup/loadout/loadout_head.dm
+4
View File
@@ -273,6 +273,10 @@
display_name = "non la hat"
path = /obj/item/clothing/head/nonla
/datum/gear/head/konyang
display_name = "gat"
path = /obj/item/clothing/head/konyang
/datum/gear/head/iac
display_name = "IAC headgear selection"
description = "A selection of hats worn by Interstellar Aid Corps volunteers."
code/modules/client/preference_setup/loadout/loadout_religion.dm
+13
View File
@@ -70,6 +70,19 @@
cape["tribunalist surcoat"] = /obj/item/clothing/accessory/poncho/dominia/red/surcoat
gear_tweaks += new /datum/gear_tweak/path(cape)
/datum/gear/religion/assunzione/robe
display_name = "assunzione robe selection"
description = "A selection of robes worn by adherents to Luceism."
path = /obj/item/clothing/accessory/poncho/assunzione
/datum/gear/religion/assunzione/robe/New()
..()
var/list/assunzionerobe = list()
assunzionerobe["assunzione robe"] = /obj/item/clothing/accessory/poncho/assunzione
assunzionerobe["assunzione vine-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/vine
assunzionerobe["assunzione gold-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/gold
gear_tweaks += new /datum/gear_tweak/path(assunzionerobe)
/datum/gear/religion/dominia/accessory
display_name = "tribunal necklace"
path = /obj/item/clothing/accessory/dominia
code/modules/client/preference_setup/loadout/loadout_suit.dm
+17
View File
@@ -439,6 +439,23 @@ datum/gear/suit/colorvest
path = /obj/item/clothing/suit/storage/toggle/overlay/submariner
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/konyang
display_name = "konyanger outerwear selection"
description = "A selection of jackets and coats from the wind-beaten shores of Konyang."
path = /obj/item/clothing/suit/storage/hooded/wintercoat/konyang
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/suit/konyang/New()
..()
var/list/konyangcoat = list()
konyangcoat["konyang village coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/konyang
konyangcoat["red konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang
konyangcoat["red short-sleeved konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang/akira
konyangcoat["red konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/pants
konyangcoat["orange konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/orange
konyangcoat["blue konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/blue
gear_tweaks += new /datum/gear_tweak/path(konyangcoat)
/datum/gear/suit/gadpathur
display_name = "gadpathurian coat selection"
path = /obj/item/clothing/suit/storage/gadpathur
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+11
View File
@@ -315,8 +315,19 @@
var/list/hanbok = list()
hanbok["magenta-blue hanbok"] = /obj/item/clothing/under/konyang
hanbok["white-pink hanbok"] = /obj/item/clothing/under/konyang/pink
hanbok["male hanbok"] = /obj/item/clothing/under/konyang/male
gear_tweaks += new /datum/gear_tweak/path(hanbok)
/datum/gear/uniform/konyang
display_name = "konyanger dress"
path = /obj/item/clothing/under/konyangdress
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/uniform/zhongshan
display_name = "zhongshan suit"
path = /obj/item/clothing/under/zhongshan
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/uniform/gadpathur
display_name = "gadpathurian fatigues"
path = /obj/item/clothing/under/uniform/gadpathur