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

More custom loadout fixes and additions (#2633)

Browse Source 
Fixes #2622
-adds more clothing for people to play dress up with their spessmen.
-fixes some long description on the ian's shirt
-allows people to toggle night vision glasses and material scanners while wearing them
-tweaks more marking related things
This commit is contained in:
Alberyk
2017-06-10 09:27:49 +03:00
committed by skull132
parent 465ae330ac
commit 3758da0475
10 changed files with 130 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+5 -5
View File
@@ -56,7 +56,7 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/accessory/black_vest
display_name = "webbing, security"
@@ -66,7 +66,7 @@
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
@@ -76,17 +76,17 @@
/datum/gear/accessory/brown_pouches
display_name = "drop pouches, engineering"
path = /obj/item/clothing/accessory/storage/brown_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/accessory/black_pouches
display_name = "drop pouches, security"
path = /obj/item/clothing/accessory/storage/black_pouches
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/accessory/white_pouches
display_name = "drop pouches, medical"
path = /obj/item/clothing/accessory/storage/white_pouches
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Nursing Intern")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"
code/modules/client/preference_setup/loadout/loadout_head.dm
+6 -6
View File
@@ -27,13 +27,13 @@
caps["flat cap"] = /obj/item/clothing/head/flatcap
caps["green cap"] = /obj/item/clothing/head/soft/green
caps["grey cap"] = /obj/item/clothing/head/soft/grey
caps["mailman cap"] = /obj/item/clothing/head/mailman
caps["orange cap"] = /obj/item/clothing/head/soft/orange
caps["purple cap"] = /obj/item/clothing/head/soft/purple
caps["rainbow cap"] = /obj/item/clothing/head/soft/rainbow
caps["red cap"] = /obj/item/clothing/head/soft/red
caps["white cap"] = /obj/item/clothing/head/soft/mime
caps["yellow cap"] = /obj/item/clothing/head/soft/yellow
caps["mailman cap"] = /obj/item/clothing/head/mailman
gear_tweaks += new/datum/gear_tweak/path(caps)
/datum/gear/head/beret
@@ -50,17 +50,17 @@
path = /obj/item/clothing/head/beret/purple
/datum/gear/head/beret/sec
display_name = "beret,security"
display_name = "beret, security"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/head/beret/warden
display_name = "beret,security (warden)"
display_name = "beret, security (warden)"
path = /obj/item/clothing/head/beret/sec/warden
allowed_roles = list("Head of Security", "Warden")
/datum/gear/head/beret/hos
display_name = "beret,security (head of security)"
display_name = "beret, security (head of security)"
path = /obj/item/clothing/head/beret/sec/hos
allowed_roles = list("Head of Security")
@@ -77,7 +77,7 @@
/datum/gear/head/hardhat
display_name = "hardhat selection"
path = /obj/item/clothing/head/hardhat
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/head/hardhat/New()
..()
@@ -112,7 +112,7 @@
gear_tweaks += new/datum/gear_tweak/path(hats)
/datum/gear/head/philosopher_wig
display_name = "natural philosopher's wig"
display_name = "natural philosopher wig"
path = /obj/item/clothing/head/philosopher_wig
/datum/gear/head/hijab
code/modules/client/preference_setup/loadout/loadout_suit.dm
+32 -8
View File
@@ -18,14 +18,27 @@
jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
jackets["black jacket"] = /obj/item/clothing/suit/storage/leather_jacket
jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket
jackets["green flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["red flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/red
jackets["blue flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/blue
jackets["track jacket"] = /obj/item/clothing/suit/storage/toggle/tracksuit
jackets["flannel jacket, green"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["flannel jacket, red"] = /obj/item/clothing/suit/storage/toggle/flannel/red
jackets["flannel jacket, blue"] = /obj/item/clothing/suit/storage/toggle/flannel/blue
jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray
jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple
jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow
gear_tweaks += new/datum/gear_tweak/path(jackets)
/datum/gear/suit/hazard_vest
display_name = "hazard vest"
display_name = "hazard vest selection"
path = /obj/item/clothing/suit/storage/hazardvest
/datum/gear/suit/hazard_vest/New()
..()
var/hazard = list()
hazard["hazard vest, orange"] = /obj/item/clothing/suit/storage/hazardvest
hazard["hazard vest, blue"] = /obj/item/clothing/suit/storage/hazardvest/blue
hazard["hazard vest, white"] = /obj/item/clothing/suit/storage/hazardvest/white
hazard["hazard vest, green"] = /obj/item/clothing/suit/storage/hazardvest/green
gear_tweaks += new/datum/gear_tweak/path(hazard)
/datum/gear/suit/hoodie
display_name = "hoodie, grey"
@@ -54,6 +67,12 @@
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 1
/datum/gear/suit/surgeryapron
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/suit/poncho
display_name = "poncho selection"
@@ -77,13 +96,18 @@
/datum/gear/suit/purple_lawyer_jacket
display_name = "suit jacket, purple"
path = /obj/item/clothing/suit/storage/lawyer/purpjacket
/datum/gear/suit/track_jacket
display_name = "track jacket"
path = /obj/item/clothing/suit/storage/toggle/tracksuit
/datum/gear/suit/trenchcoat
display_name = "trenchcoat, brown"
path = /obj/item/clothing/suit/storage/trench
/datum/gear/suit/trenchcoatgrey
display_name = "trenchcoat, grey"
path = /obj/item/clothing/suit/storage/trench/grey
/datum/gear/suit/ian
display_name = "worn shirt"
description = "A worn out, curiously comfortable t-shirt with a picture of Ian."
path = /obj/item/clothing/suit/ianshirt
/datum/gear/suit/winter
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+2 -2
View File
@@ -130,8 +130,8 @@
sort_category = "Xenowear"
/datum/gear/suit/tajaran_labcoat
display_name = "people's republic medical coat (Tajara)"
display_name = "PRA medical coat (Tajara)"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
whitelisted = "Tajara"
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
sort_category = "Xenowear"
code/modules/clothing/glasses/glasses.dm
+2
View File
@@ -71,6 +71,7 @@
desc = "You can totally see in the dark now!"
icon_state = "night"
item_state = "glasses"
action_button_name = "Toggle Goggles"
origin_tech = list(TECH_MAGNET = 2)
darkness_view = 7
toggleable = 1
@@ -100,6 +101,7 @@
desc = "Very confusing glasses."
icon_state = "material"
item_state = "glasses"
action_button_name = "Toggle Goggles"
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3)
toggleable = 1
vision_flags = SEE_OBJS
code/modules/clothing/suits/jobs.dm
+34 -1
View File
@@ -11,7 +11,22 @@
blood_overlay_type = "armor"
body_parts_covered = 0
allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/fertilizer,/obj/item/weapon/material/minihoe)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
item_state = "overalls"
/obj/item/clothing/suit/apron/surgery
name = "surgical apron"
desc = "To keep their blood off while you knife them."
icon_state = "surgeon"
item_state = "surgeon"
allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen)
//Captain
/obj/item/clothing/suit/captunic
name = "captain's parade tunic"
@@ -163,6 +178,24 @@
/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \
/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
body_parts_covered = UPPER_TORSO
/obj/item/clothing/suit/storage/hazardvest/blue
name = "blue hazard vest"
desc = "A high-visibility vest used in work zones. This one is blue."
icon_state = "hazard_b"
item_state = "hazard_b"
/obj/item/clothing/suit/storage/hazardvest/white
name = "white hazard vest"
desc = "A high-visibility vest used in work zones. This one is white."
icon_state = "hazard_w"
item_state = "hazard_w"
/obj/item/clothing/suit/storage/hazardvest/green
name = "green hazard vest"
desc = "A high-visibility vest used in work zones. This one is green."
icon_state = "hazard_g"
item_state = "hazard_g"
//Lawyer
/obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
code/modules/clothing/suits/miscellaneous.dm
+34 -11
View File
@@ -80,7 +80,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
@@ -90,7 +89,6 @@
allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash)
flags_inv = HIDEJUMPSUIT
/obj/item/clothing/suit/wcoat
name = "waistcoat"
desc = "For some classy, murderous fun."
@@ -99,15 +97,6 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
item_state = "overalls"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/syndicatefake
name = "red space suit replica"
icon_state = "syndicate"
@@ -349,3 +338,37 @@
item_state = "flannel_blue"
icon_open = "flannel_blue_open"
icon_closed = "flannel_blue"
/obj/item/clothing/suit/storage/toggle/flannel/gray
name = "grey flannel shirt"
icon_state = "flannel_gray"
item_state = "flannel_gray"
icon_open = "flannel_gray_open"
icon_closed = "flannel_gray"
/obj/item/clothing/suit/storage/toggle/flannel/purple
name = "purple flannel shirt"
icon_state = "flannel_purple"
item_state = "flannel_purple"
icon_open = "flannel_purple_open"
icon_closed = "flannel_purple"
/obj/item/clothing/suit/storage/toggle/flannel/yellow
name = "yellow flannel shirt"
icon_state = "flannel_yellow"
item_state = "flannel_yellow"
icon_open = "flannel_yellow_open"
icon_closed = "flannel_yellow"
/obj/item/clothing/suit/storage/trench
name = "brown trenchcoat"
desc = "A rugged canvas trenchcoat."
icon_state = "trench"
item_state = "trench"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/trench/grey
name = "grey trenchcoat"
icon_state = "trench2"
item_state = "trench2"
code/modules/mob/new_player/sprite_accessories.dm
+15 -9
View File
@@ -1006,29 +1006,23 @@
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand")
species_allowed = list("Unathi")
paw_socks
name = "Socks Coloration (Generic)"
icon_state = "pawsocks"
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
paw_socks_belly
name = "Socks,Belly Coloration (Generic)"
icon_state = "pawsocksbelly"
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","groin","chest")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
belly_hands_feet
name = "Hands,Feet,Belly Color (Minor)"
icon_state = "bellyhandsfeetsmall"
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","groin","chest")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
hands_feet_belly_full
name = "Hands,Feet,Belly Color (Major)"
icon_state = "bellyhandsfeet"
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","groin","chest")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
patches
name = "Color Patches"
@@ -1041,6 +1035,18 @@
icon_state = "patchesface"
body_parts = list("head")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
bands
name = "Color Bands"
icon_state = "bands"
body_parts = list("l_foot","r_foot","l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","chest","groin")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
bandsface
name = "Color Bands (Face)"
icon_state = "bandsface"
body_parts = list("head")
species_allowed = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Unathi")
tigerhead
name = "Tiger Stripes (Head, Minor)"