cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 20:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduces the presence of contractors in some departments (#8653)

Browse Source 
And adds Zavodskoi.
This commit is contained in:
Alberyk
2020-05-13 14:12:14 -03:00
committed by GitHub
parent 50eae4ecbb
commit c328c808b5
34 changed files with 246 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/asset_cache.dm
View File

@@ -189,7 +189,7 @@ var/list/asset_datums = list()
"zhlogo.png" = 'html/images/zhlogo.png',
"idrislogo.png" = 'html/images/idrislogo.png',
"eridanilogo.png" = 'html/images/eridanilogo.png',
"necrologo.png" = 'html/images/necrologo.png',
"zavodlogo.png" = 'html/images/zavodlogo.png',
"hplogo.png" = 'html/images/hplogo.png',
"belogo.png" = 'html/images/belogo.png'
)
@@ -229,7 +229,7 @@ var/list/asset_datums = list()
assets = list(
"faction_EPMC.png" = 'icons/misc/factions/ECFlogo.png',
"faction_Zeng.png" = 'icons/misc/factions/ZhenHulogo.png',
"faction_Necro.png" = 'icons/misc/factions/NecroInclogo.png',
"faction_Zavod.png" = 'icons/misc/factions/Zavodlogo.png',
"faction_NT.png" = 'icons/misc/factions/NanoTrasenlogo.png',
"faction_Idris.png" = 'icons/misc/factions/Idrislogo.png',
"faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png',

58
code/modules/client/preference_setup/loadout/loadout_factions.dm
View File

@@ -18,33 +18,33 @@
slot = slot_wear_suit
faction = "Idris Incorporated"
/datum/gear/faction/necro_beret
display_name = "brown necropolis beret"
path = /obj/item/clothing/head/beret/sec/necro
faction = "Necropolis Industries"
/datum/gear/faction/zavodskoi_beret
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_beret/alt
display_name = "black necropolis beret"
path = /obj/item/clothing/head/beret/sec/necro/alt
/datum/gear/faction/zavodskoi_beret/alt
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi/alt
sort_category = "Factions"
/datum/gear/faction/necro_uniform_alt
display_name = "brown necropolis uniform"
path = /obj/item/clothing/under/rank/security/necropolis/alt
/datum/gear/faction/zavodskoi_uniform_alt
display_name = "brown zavodskoi uniform"
path = /obj/item/clothing/under/rank/security/zavodskoi/alt
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_research_alt
display_name = "brown necropolis research uniform"
path = /obj/item/clothing/under/rank/necropolis/research/alt
/datum/gear/faction/zavodskoi_research_alt
display_name = "brown zavodskoi research uniform"
path = /obj/item/clothing/under/rank/zavodskoi/research/alt
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necro_labcoat
display_name = "necropolis labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/necro
/datum/gear/faction/zavodskoi_labcoat
display_name = "zavodskoi labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi
slot = slot_wear_suit
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
@@ -68,25 +68,25 @@
display_name = "white zeng-hu beret"
path = /obj/item/clothing/head/beret/zeng/alt
slot = slot_head
faction = "Zeng-Hu Pharmaceuticals"
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_labcoat
display_name = "zeng-hu labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/necro_patch
display_name = "necropolis sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/necro
/datum/gear/faction/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi
slot = slot_tie
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
/datum/gear/faction/necrosec_patch
display_name = "necropolis security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/necrosec
/datum/gear/faction/zavodskoisec_patch
display_name = "zavodskoi security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoisec
slot = slot_tie
faction = "Necropolis Industries"
faction = "Zavodskoi Interstellar"
allowed_roles = list("Security Officer","Forensic Technician","Warden")
/datum/gear/faction/erisec_patch