mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
The Uniformity : The Confluence of Conformity (#13773)
This commit is contained in:
Wowzewow (Wezzy)
@@ -523,7 +523,7 @@ var/const/NO_EMAG_ACT = -50
|
||||
/obj/item/card/id/distress/ap_eridani
|
||||
name = "\improper Eridani identification card"
|
||||
desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Eridani Corporate Federation."
|
||||
assignment = "EPMC Asset Protection"
|
||||
assignment = "PMCG Asset Protection"
|
||||
icon_state = "erisec_card"
|
||||
overlay_state = "erisec_card"
|
||||
|
||||
@@ -574,8 +574,8 @@ var/const/NO_EMAG_ACT = -50
|
||||
/obj/item/card/id/pmc
|
||||
name = "\improper PMCG identification card"
|
||||
desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Private Military Contracting Group."
|
||||
icon_state = "erisec_card"
|
||||
overlay_state = "erisec_card"
|
||||
icon_state = "pmc_card"
|
||||
overlay_state = "pmc_card"
|
||||
|
||||
/obj/item/card/id/zeng_hu
|
||||
name = "\improper Zeng-Hu Pharmaceuticals identification card"
|
||||
@@ -607,6 +607,12 @@ var/const/NO_EMAG_ACT = -50
|
||||
overlay_state = "einstein_card"
|
||||
iff_faction = IFF_EE
|
||||
|
||||
/obj/item/card/id/orion
|
||||
name = "\improper Orion Express identification card"
|
||||
desc = "A well-worn identification pass, retrofitted with wireless transmission technology."
|
||||
icon_state = "orion_card"
|
||||
overlay_state = "orion_card"
|
||||
|
||||
/obj/item/card/id/bluespace
|
||||
name = "bluespace identification card"
|
||||
desc = "A bizarre imitation of Nanotrasen identification cards. It seems to function normally as well."
|
||||
@@ -630,4 +636,4 @@ var/const/NO_EMAG_ACT = -50
|
||||
..()
|
||||
|
||||
/obj/item/card/id/away_site
|
||||
access = list(access_generic_away_site, access_external_airlocks)
|
||||
access = list(access_generic_away_site, access_external_airlocks)
|
||||
|
||||
@@ -310,7 +310,6 @@
|
||||
/obj/item/inflatable_duck,
|
||||
/obj/item/beach_ball,
|
||||
/obj/item/clothing/under/syndicate/tracksuit,
|
||||
/obj/item/clothing/under/mime,
|
||||
/obj/item/clothing/under/rank/fatigues/marine,
|
||||
/obj/item/clothing/under/rank/dress/marine,
|
||||
/obj/random/hoodie,
|
||||
|
||||
@@ -122,14 +122,6 @@
|
||||
icon_state = "medicalpack"
|
||||
item_state_slots = null
|
||||
|
||||
/obj/item/storage/backpack/medic/first_responder
|
||||
name = "first responder backpack"
|
||||
desc = "A bulky easy-clean backpack specially designed to carry a First Responder's equipment."
|
||||
icon = 'icons/clothing/kit/first_responder.dmi'
|
||||
icon_state = "firstresponderbackpack"
|
||||
item_state = "firstresponderbackpack"
|
||||
contained_sprite = TRUE
|
||||
|
||||
/obj/item/storage/backpack/security
|
||||
name = "security backpack"
|
||||
desc = "It's a very robust backpack."
|
||||
@@ -667,7 +659,7 @@
|
||||
set src in usr
|
||||
if(use_check_and_message(usr))
|
||||
return 0
|
||||
hooded = !hooded
|
||||
hooded = !hooded
|
||||
to_chat(usr, "You [hooded ? "raise" : "lower"] \the [src] hood.")
|
||||
icon_state = "[initial(icon_state)][hooded ? "_up" : ""]"
|
||||
item_state = "icon_state"
|
||||
@@ -687,7 +679,7 @@
|
||||
icon_state = "medcape"
|
||||
item_state = "medcape"
|
||||
|
||||
/obj/item/storage/backpack/cloak/engi
|
||||
/obj/item/storage/backpack/cloak/engi
|
||||
name = "engineering tunnel cloak"
|
||||
desc = "A Vaurca cloak with storage pockets. This one has the engineering department design."
|
||||
icon_state = "engicape"
|
||||
@@ -715,4 +707,4 @@
|
||||
name = "security tunnel cloak"
|
||||
desc = "A Vaurca cloak with storage pockets. This one has the security department design."
|
||||
icon_state = "seccape"
|
||||
item_state = "seccape"
|
||||
item_state = "seccape"
|
||||
|
||||
@@ -832,7 +832,6 @@
|
||||
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 0.7,
|
||||
/obj/item/clothing/suit/storage/vest = 0.2,
|
||||
/obj/item/clothing/suit/syndicatefake = 0.6,
|
||||
/obj/item/clothing/under/mime = 0.1,
|
||||
/obj/item/clothing/under/overalls = 1,
|
||||
/obj/item/clothing/under/rainbow = 0.9,
|
||||
/obj/item/clothing/under/syndicate/tacticool = 0.4,
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
icon_door = "mixed"
|
||||
|
||||
/obj/structure/closet/jcloset/fill()
|
||||
new /obj/item/clothing/under/rank/janitor/nt(src)
|
||||
new /obj/item/clothing/under/rank/janitor(src)
|
||||
new /obj/item/clothing/under/rank/janitor/idris(src)
|
||||
new /obj/item/device/radio/headset/headset_service(src)
|
||||
new /obj/item/clothing/gloves/black(src)
|
||||
|
||||
@@ -43,34 +43,34 @@
|
||||
new /obj/item/clothing/head/nursehat (src)
|
||||
switch(pick("blue", "green", "purple"))
|
||||
if ("blue")
|
||||
new /obj/item/clothing/under/rank/medical/blue(src)
|
||||
new /obj/item/clothing/head/surgery/blue(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/pmc(src)
|
||||
new /obj/item/clothing/head/surgery/pmc(src)
|
||||
if ("green")
|
||||
new /obj/item/clothing/under/rank/medical/green(src)
|
||||
new /obj/item/clothing/head/surgery/green(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
|
||||
new /obj/item/clothing/head/surgery/idris(src)
|
||||
if ("purple")
|
||||
new /obj/item/clothing/under/rank/medical/purple(src)
|
||||
new /obj/item/clothing/head/surgery/purple(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
|
||||
new /obj/item/clothing/head/surgery/zeng(src)
|
||||
switch(pick("blue", "green", "purple"))
|
||||
if ("blue")
|
||||
new /obj/item/clothing/under/rank/medical/blue(src)
|
||||
new /obj/item/clothing/head/surgery/blue(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/pmc(src)
|
||||
new /obj/item/clothing/head/surgery/pmc(src)
|
||||
if ("green")
|
||||
new /obj/item/clothing/under/rank/medical/green(src)
|
||||
new /obj/item/clothing/head/surgery/green(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
|
||||
new /obj/item/clothing/head/surgery/idris(src)
|
||||
if ("purple")
|
||||
new /obj/item/clothing/under/rank/medical/purple(src)
|
||||
new /obj/item/clothing/head/surgery/purple(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
|
||||
new /obj/item/clothing/head/surgery/zeng(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/pmc(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/idris(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/zeng(src)
|
||||
new /obj/item/clothing/head/headmirror
|
||||
new /obj/item/clothing/shoes/medical(src)
|
||||
new /obj/item/device/radio/headset/headset_med(src)
|
||||
new /obj/item/device/radio/headset/headset_med/alt(src)
|
||||
new /obj/item/clothing/glasses/hud/health/aviator(src)
|
||||
new /obj/item/clothing/glasses/eyepatch/hud/medical(src)
|
||||
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
|
||||
new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
|
||||
new /obj/item/clothing/head/hardhat/first_responder(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/medical_fr
|
||||
name = "first responder's locker"
|
||||
@@ -85,10 +85,9 @@
|
||||
new /obj/item/clothing/head/hardhat/first_responder(src)
|
||||
new /obj/item/device/radio/headset/headset_med(src)
|
||||
new /obj/item/clothing/glasses/hud/health(src)
|
||||
new /obj/item/storage/backpack/medic/first_responder(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
|
||||
new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
|
||||
new /obj/item/clothing/under/rank/medical/first_responder/nt(src)
|
||||
new /obj/item/clothing/under/rank/medical/first_responder(src)
|
||||
new /obj/item/clothing/under/rank/medical/first_responder/zeng(src)
|
||||
new /obj/item/clothing/under/rank/medical/first_responder/pmc(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
@@ -104,7 +103,10 @@
|
||||
new /obj/item/clothing/mask/gas/alt(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/auto_cpr(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/fr_jacket/alt(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/CMO
|
||||
name = "chief medical officer's locker"
|
||||
@@ -141,12 +143,12 @@
|
||||
/obj/structure/closet/secure_closet/CMO2/fill()
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
new /obj/item/storage/backpack/satchel_med(src)
|
||||
new /obj/item/clothing/under/rank/medical/blue(src)
|
||||
new /obj/item/clothing/head/surgery/blue(src)
|
||||
new /obj/item/clothing/under/rank/medical/green(src)
|
||||
new /obj/item/clothing/head/surgery/green(src)
|
||||
new /obj/item/clothing/under/rank/medical/purple(src)
|
||||
new /obj/item/clothing/head/surgery/purple(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/pmc(src)
|
||||
new /obj/item/clothing/head/surgery/pmc(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
|
||||
new /obj/item/clothing/under/rank/chief_medical_officer(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
|
||||
|
||||
@@ -106,7 +106,6 @@
|
||||
new /obj/item/clothing/suit/armor/carrier/hos(src)
|
||||
new /obj/item/clothing/accessory/leg_guard(src)
|
||||
new /obj/item/clothing/accessory/arm_guard(src)
|
||||
new /obj/item/clothing/head/hos/corp(src)
|
||||
new /obj/item/clothing/head/helmet/hos(src)
|
||||
new /obj/item/clothing/suit/storage/security/hos(src)
|
||||
new /obj/item/clothing/accessory/badge/hos(src)
|
||||
@@ -146,7 +145,6 @@
|
||||
new /obj/item/clothing/suit/armor/carrier/hos(src)
|
||||
new /obj/item/clothing/accessory/leg_guard(src)
|
||||
new /obj/item/clothing/accessory/arm_guard(src)
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/helmet/hos(src)
|
||||
new /obj/item/clothing/suit/storage/security/hos(src)
|
||||
//Tools
|
||||
@@ -177,8 +175,6 @@
|
||||
new /obj/item/clothing/suit/armor/carrier/officer(src)
|
||||
new /obj/item/clothing/accessory/arm_guard(src)
|
||||
new /obj/item/clothing/accessory/leg_guard(src)
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/warden/corp(src)
|
||||
new /obj/item/clothing/head/helmet/security(src)
|
||||
new /obj/item/clothing/suit/storage/security/warden(src)
|
||||
new /obj/item/clothing/accessory/badge/warden(src)
|
||||
@@ -212,7 +208,7 @@
|
||||
new /obj/item/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/clothing/head/beret/security(src)
|
||||
new /obj/item/clothing/head/softcap/security(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest/cadet(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest/security(src)
|
||||
new /obj/item/clothing/under/rank/cadet(src)
|
||||
//Tools
|
||||
new /obj/item/device/radio/headset/headset_sec(src)
|
||||
@@ -241,8 +237,6 @@
|
||||
new /obj/item/clothing/suit/armor/carrier/officer(src)
|
||||
new /obj/item/clothing/accessory/arm_guard(src)
|
||||
new /obj/item/clothing/accessory/leg_guard(src)
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/softcap/security/corp(src)
|
||||
new /obj/item/clothing/head/helmet/security(src)
|
||||
new /obj/item/clothing/suit/storage/security/officer(src)
|
||||
new /obj/item/clothing/accessory/badge/officer(src)
|
||||
@@ -271,10 +265,11 @@
|
||||
//Appearance
|
||||
new /obj/item/storage/backpack/satchel/leather(src)
|
||||
new /obj/item/clothing/suit/storage/det_jacket(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
new /obj/item/clothing/under/det(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/security(src)
|
||||
new /obj/item/clothing/under/det/black(src)
|
||||
new /obj/item/clothing/under/det/classic(src)
|
||||
new /obj/item/clothing/under/det/idris(src)
|
||||
new /obj/item/clothing/under/det/pmc(src)
|
||||
new /obj/item/clothing/under/det/zavod(src)
|
||||
new /obj/item/clothing/accessory/badge/investigator(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/forensics(src)
|
||||
new /obj/item/clothing/gloves/black/forensic(src)
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
/obj/structure/closet/wardrobe/toxins_white/fill()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/scientist/zavod(src)
|
||||
new /obj/item/clothing/under/rank/scientist/nt(src)
|
||||
new /obj/item/clothing/under/rank/scientist(src)
|
||||
new /obj/item/clothing/under/rank/scientist/zeng(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
@@ -285,13 +285,14 @@
|
||||
|
||||
/obj/structure/closet/wardrobe/pharmacy_white/fill()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/pharmacist/zeng(src)
|
||||
new /obj/item/clothing/under/rank/pharmacist/nt(src)
|
||||
new /obj/item/clothing/under/rank/pharmacist/pmc(src)
|
||||
new /obj/item/clothing/under/rank/medical/pharmacist(src)
|
||||
new /obj/item/clothing/under/rank/medical/pharmacist/zeng(src)
|
||||
new /obj/item/clothing/under/rank/medical/pharmacist/pmc(src)
|
||||
new /obj/item/clothing/shoes/chemist(src)
|
||||
new /obj/item/clothing/shoes/chemist(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/nt(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/zeng(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/pmc(src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/virology_white
|
||||
@@ -315,9 +316,9 @@
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/medical(src)
|
||||
new /obj/item/clothing/under/rank/medical(src)
|
||||
new /obj/item/clothing/under/rank/medical/blue(src)
|
||||
new /obj/item/clothing/under/rank/medical/green(src)
|
||||
new /obj/item/clothing/under/rank/medical/purple(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/pmc(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
|
||||
new /obj/item/clothing/under/rank/medical/surgeon/zeng(src)
|
||||
new /obj/item/clothing/shoes/medical(src)
|
||||
new /obj/item/clothing/shoes/medical(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
|
||||
Reference in New Issue
Block a user