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

Merge branch 'master' into fixes_compile

Browse Source
This commit is contained in:
alberyk
2022-02-04 14:22:38 -03:00
parent 3d4dfea299 e314a6ec9b
commit a61a4b7e2c
78 changed files with 1128 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_factions.dm
+2 -1
View File
@@ -192,7 +192,7 @@
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_labcoat
display_name = "zeng-hu labcoat selection"
display_name = "zeng-hu coat selection"
path = /obj/item/clothing/suit/storage/toggle/labcoat/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
@@ -202,6 +202,7 @@
var/list/masks = list()
masks["zeng-hu labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng
masks["zeng-hu labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt
masks["zeng-hu first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng
gear_tweaks += new /datum/gear_tweak/path(masks)
/datum/gear/faction/zenghu_apron
code/modules/client/preference_setup/loadout/loadout_general.dm
+4
View File
@@ -309,3 +309,7 @@
path = /obj/item/storage/box/yarn
description = "A box containing yarn."
flags = null
/datum/gear/gadbook
display_name = "gadpathurian morale manual"
path = /obj/item/device/litanybook/gadpathur
code/modules/client/preference_setup/loadout/loadout_religion.dm
+4
View File
@@ -114,3 +114,7 @@
display_name = "assunzione warding sphere sheath"
description = "A small metal shell designed to hold a warding sphere."
path = /obj/item/storage/assunzionesheath
/datum/gear/religion/dominia/codex
display_name = "tribunal codex"
path = /obj/item/device/litanybook
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
+92
View File
@@ -54,6 +54,19 @@
averagetypes[initial(average.name)] = average
gear_tweaks += new /datum/gear_tweak/path(sortAssoc(averagetypes))
/datum/gear/ears/skrell/workhat
display_name = "worker hat"
path = /obj/item/clothing/ears/skrell/workcap
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/workhat/New()
..()
var/list/hat = list()
hat["worker's hat"] = /obj/item/clothing/ears/skrell/workcap
hat["long worker's hat"] = /obj/item/clothing/ears/skrell/workcap/long
gear_tweaks += new /datum/gear_tweak/path(hat)
/datum/gear/accessory/capes
display_name = "shoulder capes"
path = /obj/item/clothing/accessory/poncho/shouldercape
@@ -185,3 +198,82 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/
if(!istype(PP))
return
PP.credit_score = metadata + pick(-0.01, 0, 0.01)
/datum/gear/uniform/skrell/work
display_name = "work uniforms"
path = /obj/item/clothing/under/skrell/ox
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS)
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/uniform/skrell/work/New()
..()
var/list/outfit = list()
outfit["ox research"] = /obj/item/clothing/under/skrell/ox
outfit["ox security"] = /obj/item/clothing/under/skrell/ox/security
outfit["ox engineer"] = /obj/item/clothing/under/skrell/ox/engineer
outfit["ox service"] = /obj/item/clothing/under/skrell/ox/service
outfit["ox medical"] = /obj/item/clothing/under/skrell/ox/med
outfit["ix research"] = /obj/item/clothing/under/skrell/ix
outfit["ix security"] = /obj/item/clothing/under/skrell/ix/security
outfit["ix engineer"] = /obj/item/clothing/under/skrell/ix/engineer
outfit["ix service"] = /obj/item/clothing/under/skrell/ix/service
outfit["ix medical"] = /obj/item/clothing/under/skrell/ix/med
outfit["oqi research"] = /obj/item/clothing/under/skrell/oqi
outfit["oqi security"] = /obj/item/clothing/under/skrell/oqi/security
outfit["oqi engineer"] = /obj/item/clothing/under/skrell/oqi/engineer
outfit["oqi service"] = /obj/item/clothing/under/skrell/oqi/service
outfit["oqi medical"] = /obj/item/clothing/under/skrell/oqi/med
outfit["iqi research"] = /obj/item/clothing/under/skrell/iqi
outfit["iqi security"] = /obj/item/clothing/under/skrell/iqi/security
outfit["iqi engineer"] = /obj/item/clothing/under/skrell/iqi/engineer
outfit["iqi service"] = /obj/item/clothing/under/skrell/iqi/service
outfit["iqi medical"] = /obj/item/clothing/under/skrell/iqi/med
gear_tweaks += new /datum/gear_tweak/path(outfit)
/datum/gear/suit/skrell/jacket
display_name = "work jackets"
path = /obj/item/clothing/suit/storage/toggle/skrell
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/skrell/jacket/New()
..()
var/list/jacket = list()
jacket["ox research"] = /obj/item/clothing/suit/storage/toggle/skrell
jacket["ox bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/security
jacket["ox engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/engineer
jacket["ox cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/service
jacket["ox medical"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/med
jacket["ix research"] = /obj/item/clothing/suit/storage/toggle/skrell/ix
jacket["ix bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/security
jacket["ix engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/engineer
jacket["ix cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/service
jacket["ix medical"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/med
jacket["oqi research"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi
jacket["oqi bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/security
jacket["oqi engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/engineer
jacket["oqi cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/service
jacket["oqi medical"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/med
jacket["iqi research"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi
jacket["iqi bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/security
jacket["iqi engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/engineer
jacket["iqi cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/service
jacket["iqi medical"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/med
gear_tweaks += new /datum/gear_tweak/path(jacket)
/datum/gear/accessory/skrell/workcloak
display_name = "work cloaks"
path = /obj/item/clothing/accessory/poncho/shouldercape
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/skrell/workcloak/New()
..()
var/list/workcloak = list()
workcloak["ox cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak
workcloak["ix cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/ix
workcloak["oqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/oqi
workcloak["iqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/iqi
gear_tweaks += new /datum/gear_tweak/path(workcloak)