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

Faction updoots (#6765)

Browse Source
This commit is contained in:
Erki
2019-07-24 21:09:16 +02:00
committed by Werner
parent e9645b92b8
commit b435a8f573
21 changed files with 282 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-30
View File
@@ -193,33 +193,3 @@
/datum/gear/accessory/chaps/black
display_name = "chaps, black"
path = /obj/item/clothing/accessory/chaps/black
/datum/gear/accessory/badge/contractors
display_name = "contractor ID selection"
description = "A selection of contractor IDs."
path = /obj/item/clothing/accessory/badge/contractor
/datum/gear/accessory/badge/contractors/New()
..()
var/badge = list()
badge["Einstein Engines card"] = /obj/item/clothing/accessory/badge/contractor/einstein
badge["Necropolis Industries card"] = /obj/item/clothing/accessory/badge/contractor
badge["Idris Incorporated card"] = /obj/item/clothing/accessory/badge/contractor/idris
badge["Hephaestus Industries card"] = /obj/item/clothing/accessory/badge/contractor/hephaestus
badge["Zeng-Hu Pharmaceuticals card"] = /obj/item/clothing/accessory/badge/contractor/zenghu
gear_tweaks += new/datum/gear_tweak/path(badge)
/datum/gear/accessory/badge/security_contractors
display_name = "security contractor ID selection"
description = "A selection of security contractor IDs."
path = /obj/item/clothing/accessory/badge/contractor/necrosec
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
/datum/gear/accessory/badge/security_contractors/New()
..()
var/secbadge = list()
secbadge["Necropolis Industries security card"] = /obj/item/clothing/accessory/badge/contractor/necrosec
secbadge["Idris Incorporated security card"] = /obj/item/clothing/accessory/badge/contractor/idrissec
secbadge["Idris Incorporated IRU card"] = /obj/item/clothing/accessory/badge/contractor/iru
secbadge["Eridani PMC card"] = /obj/item/clothing/accessory/badge/contractor/eridani
gear_tweaks += new/datum/gear_tweak/path(secbadge)
code/modules/client/preference_setup/loadout/loadout_uniform.dm
-16
View File
@@ -153,22 +153,6 @@
path = /obj/item/clothing/under/dress/dress_hr
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/security_contractors
display_name = "security contractor uniform selection"
description = "A selection of security contractor uniforms."
path = /obj/item/clothing/under/rank/security/necropolis
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
/datum/gear/uniform/security_contractors/New()
..()
var/uniform = list()
uniform["Necropolis Industries security uniform"] = /obj/item/clothing/under/rank/security/necropolis
uniform["Idris Incorporated security uniform"] = /obj/item/clothing/under/rank/security/idris
uniform["Idris Incorporated security uniform, alternative"] = /obj/item/clothing/under/rank/security/idris/alt
uniform["Eridani PMC uniform"] = /obj/item/clothing/under/rank/security/eridani
uniform["Eridani PMC uniform, alternative"] = /obj/item/clothing/under/rank/security/eridani/alt
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/pants
display_name = "pants selection"
description = "A selection of pants."
code/modules/client/preference_setup/occupation/occupation.dm
+10 -6
View File
@@ -378,16 +378,19 @@
pref.player_alt_titles.Cut()
/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(user, selected_faction)
/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction)
simple_asset_ensure_is_sent(user, /datum/asset/simple/faction_icons)
var/list/dat = list("<center>")
var/list/dat = list("<center><b>")
var/list/factions = list()
for (var/datum/faction/faction in SSjobs.factions)
if (faction.name == selected_faction)
dat += " [faction.name] "
factions += "[faction.name]"
else
dat += " <a href='?src=\ref[src];faction_preview=[html_encode(faction.name)]'>[faction.name]</a> "
factions += "<a href='?src=\ref[src];faction_preview=[html_encode(faction.name)]'>[faction.name]</a>"
dat += factions.Join(" | ") + "</b>"
var/datum/faction/faction = SSjobs.name_factions[selected_faction]
@@ -404,9 +407,10 @@
if (faction.is_default)
dat += "<br><center><small>This faction is the default faction aboard this installation.</small></center>"
dat += "<br><br>[faction.description]"
dat += "<br><br><center><a href='?src=\ref[user.client];JSlink=wiki;wiki_page=[replacetext(faction.name, " ", "_")]'>Read the Wiki</a></center>"
dat += "<br>[faction.description]"
show_browser(user, dat.Join(), "window=factionpreview")
show_browser(user, dat.Join(), "window=factionpreview;size=400x600")
/datum/category_item/player_setup_item/occupation/proc/validate_and_set_faction(selected_faction)
var/datum/faction/faction = SSjobs.name_factions[selected_faction]