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

Loadout, clothing and accessories update and additions (#2267)

Browse Source 
-turn some custom items into regular ones, their original owners will keep their more snowflake version, at tishina's request due to this new policy: https://forums.aurorastation.org/viewtopic.php?f=25&t=8087
-fix the mercenary's voidsuit and the radsuit having exposed hands in their mob sprites
-fix the iaa rig having no sprite when deployed
-adds flannel shirts/jackets that strudel was asking me for months
-adds a medical webbing and drop pouches versions of the webbings
-brings back the IAC armband from old code
-adds pink lipstick

When the update goes into master, I will make another pr fixing the custom item paths and etc.
This commit is contained in:
Alberyk
2017-05-17 13:49:47 +03:00
committed by skull132
parent f78328499c
commit 6dea99eb64
21 changed files with 158 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cosmetics.dm
+6 -3
View File
@@ -21,13 +21,16 @@
/obj/item/weapon/lipstick/black
name = "black lipstick"
colour = "black"
/obj/item/weapon/lipstick/pink
name = "pink lipstick"
colour = "pink"
/obj/item/weapon/lipstick/random
name = "lipstick"
/obj/item/weapon/lipstick/random/New()
colour = pick("red","purple","jade","black")
colour = pick("red","purple","jade","pink","black")
name = "[colour] lipstick"
@@ -78,4 +81,4 @@
item_state = "purplecomb"
/obj/item/weapon/haircomb/attack_self(mob/user)
user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [user.gender == FEMALE ? "lady" : "guy"].</span>")
user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [user.gender == FEMALE ? "lady" : "guy"].</span>")
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+27 -1
View File
@@ -24,6 +24,7 @@
armbands["science armband"] = /obj/item/clothing/accessory/armband/science
armbands["synthetic intelligence movement armband"] = /obj/item/clothing/accessory/armband/movement
armbands["ATLAS armband"] = /obj/item/clothing/accessory/armband/atlas
armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac
gear_tweaks += new/datum/gear_tweak/path(armbands)
/datum/gear/accessory/holster
@@ -60,12 +61,37 @@
/datum/gear/accessory/black_vest
display_name = "webbing, security"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective" )
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective")
/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")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
path = /obj/item/clothing/accessory/storage/webbing
cost = 2
/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")
/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")
/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")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"
path = /obj/item/clothing/accessory/storage/pouches
cost = 2
/datum/gear/accessory/locket
display_name = "silver locket"
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+1
View File
@@ -14,6 +14,7 @@
lipsticks["lipstick, purple"] = /obj/item/weapon/lipstick/purple
lipsticks["lipstick, jade"] = /obj/item/weapon/lipstick/jade
lipsticks["lipstick, black"] = /obj/item/weapon/lipstick/black
lipsticks["lipstick, pink"] = /obj/item/weapon/lipstick/pink
gear_tweaks += new/datum/gear_tweak/path(lipsticks)
/datum/gear/cosmetic/mirror
code/modules/client/preference_setup/loadout/loadout_suit.dm
+3
View File
@@ -18,6 +18,9 @@
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
gear_tweaks += new/datum/gear_tweak/path(jackets)
/datum/gear/suit/hazard_vest
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1
View File
@@ -49,6 +49,7 @@
skirts["plaid skirt, purple"] = /obj/item/clothing/under/dress/plaid_purple
skirts["plaid skirt, red"] = /obj/item/clothing/under/dress/plaid_red
skirts["jumpskirt, black"] = /obj/item/clothing/under/blackjumpskirt
skirts["skirt, black"] = /obj/item/clothing/under/blackskirt
gear_tweaks += new/datum/gear_tweak/path(skirts)
/datum/gear/uniform/suit
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+36 -22
View File
@@ -1,4 +1,4 @@
//unathi clothing
//unathi items
/datum/gear/suit/unathi_mantle
display_name = "hide mantle (Unathi)"
@@ -20,8 +20,27 @@
cost = 1
whitelisted = "Unathi"
sort_category = "Xenowear"
/datum/gear/gloves/unathi
display_name = "gloves selection (Unathi)"
path = /obj/item/clothing/gloves/black/unathi
whitelisted = "Unathi"
sort_category = "Xenowear"
//skrell headtail adorns
/datum/gear/gloves/unathi/New()
..()
var/un_gloves = list()
un_gloves["black gloves"] = /obj/item/clothing/gloves/black/unathi
un_gloves["red gloves"] = /obj/item/clothing/gloves/red/unathi
un_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/unathi
un_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/unathi
un_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/unathi
un_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/unathi
un_gloves["green gloves"] = /obj/item/clothing/gloves/green/unathi
un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi
gear_tweaks += new/datum/gear_tweak/path(un_gloves)
//skrell items
/datum/gear/ears/f_skrell
display_name = "headtail-wear, female (Skrell)"
@@ -57,6 +76,7 @@
m_chains["blue-jeweled bands"] = /obj/item/clothing/ears/skrell/bluejeweled_band
m_chains["silver bands"] = /obj/item/clothing/ears/skrell/silver_band
m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male
m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/purple_skrell_cloth_male
gear_tweaks += new/datum/gear_tweak/path(m_chains)
//vaurca items
@@ -82,26 +102,7 @@
whitelisted = "Vaurca Worker"
sort_category = "Xenowear"
//beastmen gloves
/datum/gear/gloves/unathi
display_name = "gloves selection (Unathi)"
path = /obj/item/clothing/gloves/black/unathi
whitelisted = "Unathi"
sort_category = "Xenowear"
/datum/gear/gloves/unathi/New()
..()
var/un_gloves = list()
un_gloves["black gloves"] = /obj/item/clothing/gloves/black/unathi
un_gloves["red gloves"] = /obj/item/clothing/gloves/red/unathi
un_gloves["blue gloves"] = /obj/item/clothing/gloves/blue/unathi
un_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/unathi
un_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/unathi
un_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/unathi
un_gloves["green gloves"] = /obj/item/clothing/gloves/green/unathi
un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi
gear_tweaks += new/datum/gear_tweak/path(un_gloves)
//tajara items
/datum/gear/gloves/tajara
display_name = "gloves selection (Tajara)"
@@ -121,3 +122,16 @@
taj_gloves["green gloves"] = /obj/item/clothing/gloves/green/tajara
taj_gloves["white gloves"] = /obj/item/clothing/gloves/white/tajara
gear_tweaks += new/datum/gear_tweak/path(taj_gloves)
/datum/gear/suit/tajara_coat
display_name = "tajaran naval coat (Tajara)"
path = /obj/item/clothing/suit/storage/tajaran
whitelisted = "Tajara"
sort_category = "Xenowear"
/datum/gear/suit/tajaran_labcoat
display_name = "people's republic 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")
sort_category = "Xenowear"
code/modules/clothing/ears/skrell.dm
+7 -1
View File
@@ -92,4 +92,10 @@
name = "skrell blue headtail cloth"
desc = "A blue cloth band worn by female skrell around their head tails."
icon_state = "blue_skrell_cloth_band_female"
item_state = "blue_skrell_cloth_band_female"
item_state = "blue_skrell_cloth_band_female"
/obj/item/clothing/ears/skrell/purple_skrell_cloth_male
name = "skrell purple head cloth"
desc = "A purple cloth band worn by male skrell around their head tails."
icon_state = "purple_skrell_cloth_male"
item_state = "purple_skrell_cloth_male"
code/modules/clothing/suits/alien.dm
+14
View File
@@ -37,3 +37,17 @@
desc = "A scarf of coarse fabric. Seems to have ear-holes."
icon_state = "zhan_scarf"
body_parts_covered = HEAD|FACE
/obj/item/clothing/suit/storage/tajaran
name = "tajaran naval coat"
desc = "A thick wool coat from Adhomai."
icon_state = "naval_coat"
item_state = "naval_coat"
/obj/item/clothing/suit/storage/toggle/labcoat/tajaran
name = "people's republic medical coat"
desc = "A sterile insulated coat made of leather stitched over fur."
icon_state = "taj_jacket"
item_state = "taj_jacket"
icon_open = "taj_jacket_open"
icon_closed = "taj_jacket"
code/modules/clothing/suits/miscellaneous.dm
+23
View File
@@ -326,3 +326,26 @@
icon_open = "trackjacket_open"
icon_closed = "trackjacket"
contained_sprite = 1
/obj/item/clothing/suit/storage/toggle/flannel
name = "green flannel shirt"
desc = "A flannel shirt, for all your space hipster needs."
icon_state = "flannel_green"
item_state = "flannel_green"
icon_open = "flannel_green_open"
icon_closed = "flannel_green"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/toggle/flannel/red
name = "red flannel shirt"
icon_state = "flannel_red"
item_state = "flannel_red"
icon_open = "flannel_red_open"
icon_closed = "flannel_red"
/obj/item/clothing/suit/storage/toggle/flannel/blue
name = "blue flannel shirt"
icon_state = "flannel_blue"
item_state = "flannel_blue"
icon_open = "flannel_blue_open"
icon_closed = "flannel_blue"
code/modules/clothing/suits/storage.dm
-1
View File
@@ -92,4 +92,3 @@
usr << "\The [src] does not have a vest badge."
return
update_clothing_icon()
code/modules/clothing/under/accessories/armband.dm
+5
View File
@@ -43,3 +43,8 @@
name = "atlas armband"
desc = "This is a armband showing anyone who sees this person, as a member of the political party Atlas. This one is black."
icon_state = "black"
/obj/item/clothing/accessory/armband/iac
name = "interstellar aid corps armband"
desc = "An armband denoting its wearer as a medical worker of the Interstellar Aid Corps. This one is white and blue."
icon_state = "iac"
code/modules/clothing/under/accessories/storage.dm
+29
View File
@@ -60,6 +60,35 @@
desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
icon_state = "vest_brown"
slots = 5
/obj/item/clothing/accessory/storage/white_vest
name = "white webbing vest"
desc = "Durable white synthcotton vest with lots of pockets to carry essentials."
icon_state = "vest_white"
slots = 5
/obj/item/clothing/accessory/storage/pouches
name = "drop pouches"
desc = "Synthcotton bags to hold whatever you need, but cannot hold in hands."
icon_state = "thigh_brown" //todo: get a different sprite for it
/obj/item/clothing/accessory/storage/black_pouches
name = "black drop pouches"
desc = "Robust black synthcotton bags to hold whatever you need, but cannot hold in hands."
icon_state = "thigh_black"
slots = 5
/obj/item/clothing/accessory/storage/brown_pouches
name = "brown drop pouches"
desc = "Worn brownish synthcotton bags to hold whatever you need, but cannot hold in hands."
icon_state = "thigh_brown"
slots = 5
/obj/item/clothing/accessory/storage/white_pouches
name = "white drop pouches"
desc = "Durable white synthcotton bags to hold whatever you need, but cannot hold in hands."
icon_state = "thigh_white"
slots = 5
/obj/item/clothing/accessory/storage/knifeharness
name = "decorated harness"