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

Resprites some accessories (#7562)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2019-12-19 05:46:43 +08:00
committed by Werner
parent 6cf3508082
commit 96b339d766
10 changed files with 119 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -47,10 +47,14 @@
/datum/gear/accessory/holster/New()
..()
var/holsters = list()
holsters["holster, armpit"] = /obj/item/clothing/accessory/holster/armpit
holsters["holster, hip"] = /obj/item/clothing/accessory/holster/hip
holsters["holster, waist"] = /obj/item/clothing/accessory/holster/waist
holsters["holster, thigh"] = /obj/item/clothing/accessory/holster/thigh
holsters["black holster, armpit"] = /obj/item/clothing/accessory/holster/armpit
holsters["black holster, hip"] = /obj/item/clothing/accessory/holster/hip
holsters["black holster, waist"] = /obj/item/clothing/accessory/holster/waist
holsters["black holster, thigh"] = /obj/item/clothing/accessory/holster/thigh
holsters["brown holster, armpit"] = /obj/item/clothing/accessory/holster/armpit
holsters["brown holster, hip"] = /obj/item/clothing/accessory/holster/hip
holsters["brown holster, waist"] = /obj/item/clothing/accessory/holster/waist
holsters["brown holster, thigh"] = /obj/item/clothing/accessory/holster/thigh
gear_tweaks += new/datum/gear_tweak/path(holsters)
/datum/gear/accessory/tie
@@ -60,17 +64,18 @@
/datum/gear/accessory/tie/New()
..()
var/ties = list()
ties["blue tie"] = /obj/item/clothing/accessory/blue
ties["red tie"] = /obj/item/clothing/accessory/red
ties["horrible tie"] = /obj/item/clothing/accessory/horrible
ties["blue tie with a clip"] = /obj/item/clothing/accessory/tie/blue_clip
ties["blue long tie"] = /obj/item/clothing/accessory/tie/blue_long
ties["red tie with a clip"] = /obj/item/clothing/accessory/tie/red_clip
ties["red long tie"] = /obj/item/clothing/accessory/tie/red_long
ties["black tie"] = /obj/item/clothing/accessory/tie/black
ties["dark green tie"] = /obj/item/clothing/accessory/tie/darkgreen
ties["orange tie"] = /obj/item/clothing/accessory/tie/orange
ties["yellow tie"] = /obj/item/clothing/accessory/tie/yellow
ties["horrible tie"] = /obj/item/clothing/accessory/horrible
ties["green tie"] = /obj/item/clothing/accessory/tie/green
ties["dark green tie"] = /obj/item/clothing/accessory/tie/darkgreen
ties["blue tie"] = /obj/item/clothing/accessory/blue
ties["blue tie with a clip"] = /obj/item/clothing/accessory/tie/blue_clip
ties["navy tie"] = /obj/item/clothing/accessory/tie/navy
ties["purple tie"] = /obj/item/clothing/accessory/tie/purple
ties["black tie"] = /obj/item/clothing/accessory/tie/black
ties["white tie"] = /obj/item/clothing/accessory/tie/white
gear_tweaks += new/datum/gear_tweak/path(ties)

68
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -108,51 +108,55 @@
return
..()
/obj/item/clothing/accessory/blue
name = "blue tie"
icon_state = "bluetie"
/obj/item/clothing/accessory/red
name = "red tie"
icon_state = "redtie"
/obj/item/clothing/accessory/tie/red_clip
name = "red tie with a clip"
icon_state = "redcliptie"
/obj/item/clothing/accessory/tie/orange
name = "orange tie"
icon_state = "orangetie"
/obj/item/clothing/accessory/tie/yellow
name = "yellow tie"
icon_state = "yellowtie"
/obj/item/clothing/accessory/horrible
name = "horrible tie"
desc = "A neosilk clip-on tie. This one is disgusting."
icon_state = "horribletie"
/obj/item/clothing/accessory/tie/blue_clip
name = "blue tie with a clip"
icon_state = "bluecliptie"
/obj/item/clothing/accessory/tie/blue_long
name = "blue long tie"
icon_state = "bluelongtie"
/obj/item/clothing/accessory/tie/red_clip
name = "red tie with a clip"
icon_state = "redcliptie"
/obj/item/clothing/accessory/tie/red_long
name = "red long tie"
icon_state = "redlongtie"
/obj/item/clothing/accessory/tie/black
name = "black tie"
icon_state = "blacktie"
/obj/item/clothing/accessory/tie/green
name = "green tie"
icon_state = "greentie"
/obj/item/clothing/accessory/tie/darkgreen
name = "dark green tie"
icon_state = "dgreentie"
/obj/item/clothing/accessory/tie/yellow
name = "yellow tie"
icon_state = "yellowtie"
/obj/item/clothing/accessory/blue
name = "blue tie"
icon_state = "bluetie"
/obj/item/clothing/accessory/tie/blue_clip
name = "blue tie with a clip"
icon_state = "bluecliptie"
/obj/item/clothing/accessory/tie/navy
name = "navy tie"
icon_state = "navytie"
/obj/item/clothing/accessory/tie/purple
name = "purple tie"
icon_state = "purpletie"
/obj/item/clothing/accessory/tie/black
name = "black tie"
icon_state = "blacktie"
/obj/item/clothing/accessory/tie/white
name = "white tie"
icon_state = "whitetie"
@@ -680,12 +684,7 @@
desc = "A lightweight polymer frame meant to brace and hold someone's legs upright comfortably."
icon_state = "legbrace"
item_state = "legbrace"
/obj/item/clothing/accessory/offworlder/bracer/neckbrace
name = "neckbrace"
desc = "A lightweight polymer frame meant to brace and hold someone's neck upright comfortably."
icon_state = "neckbrace"
item_state = "neckbrace"
drop_sound = 'sound/items/drop/gun.ogg'
/obj/item/clothing/accessory/offworlder/bracer/neckbrace
name = "neckbrace"
@@ -700,6 +699,7 @@
item_state = "tc-pin"
overlay_state = "tc-pin"
flippable = 1
drop_sound = 'sound/items/drop/ring.ogg'
/obj/item/clothing/accessory/sol_pin
name = "Sol Alliance pin"
@@ -708,6 +708,7 @@
item_state = "sol-pin"
overlay_state = "sol-pin"
flippable = 1
drop_sound = 'sound/items/drop/ring.ogg'
/obj/item/clothing/accessory/hadii_pin
name = "hadiist party pin"
@@ -720,6 +721,7 @@
For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \
seem as nothing but a honor and does not grant any status or position that a regular Party member would have."
flippable = 1
drop_sound = 'sound/items/drop/ring.ogg'
/obj/item/clothing/accessory/dogtags
name = "dogtags"
@@ -727,6 +729,7 @@
icon_state = "tags"
item_state = "tags"
overlay_state = "tags"
drop_sound = 'sound/items/drop/scrap.ogg'
/obj/item/clothing/accessory/sleevepatch
name = "sleeve patch"
@@ -734,6 +737,7 @@
icon_state = "patch"
overlay_state = "patch"
flippable = 1
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/accessory/sleevepatch/necro
name = "\improper Necropolis Industries sleeve patch"

2
code/modules/clothing/under/accessories/badges.dm
View File

@@ -111,8 +111,6 @@
overlay_state = "holobadge"
var/emagged //Emagging removes Sec check.
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/clothing/accessory/badge/holo/cord
icon_state = "holobadge-cord"
overlay_state = null

25
code/modules/clothing/under/accessories/holster.dm
View File

@@ -126,23 +126,40 @@
H.unholster(usr)
/obj/item/clothing/accessory/holster/armpit
name = "armpit holster"
name = "black armpit holster"
desc = "A worn-out handgun holster. Mostly seen in cheesy cop flicks, used to keep the actor's face in the shot."
icon_state = "holster"
/obj/item/clothing/accessory/holster/waist
name = "waist holster"
name = "black waist holster"
desc = "A handgun holster, made of expensive leather. Can possibly be concealed under a shirt, albeit a little archaic."
icon_state = "holster_low"
/obj/item/clothing/accessory/holster/hip
name = "hip holster"
name = "black hip holster"
desc = "<i>No one dared to ask his business, no one dared to make a slip. The stranger there among them had a big iron on his hip.</i>"
icon_state = "holster_hip"
/obj/item/clothing/accessory/holster/thigh
name = "thigh holster"
name = "black thigh holster"
desc = "A drop leg holster made of a durable synthetic fiber."
icon_state = "holster_thigh"
sound_in = 'sound/weapons/holster/tactiholsterin.ogg'
sound_out = 'sound/weapons/holster/tactiholsterout.ogg'
/obj/item/clothing/accessory/holster/armpit/brown
name = "brown armpit holster"
icon_state = "holster_brown"
/obj/item/clothing/accessory/holster/waist/brown
name = "brown waist holster"
icon_state = "holster_brown_low"
/obj/item/clothing/accessory/holster/hip/brown
name = "brown hip holster"
icon_state = "holster__brown_hip"
/obj/item/clothing/accessory/holster/thigh
name = "brown thigh holster"
icon_state = "holster_brown_thigh"

6
code/modules/games/cards.dm
View File

@@ -15,6 +15,7 @@
name = "deck of cards"
desc = "A simple deck of playing cards."
icon_state = "deck"
drop_sound = 'sound/items/drop/paper.ogg'
/obj/item/deck/Initialize()
. = ..()
@@ -171,9 +172,9 @@
/obj/item/pack/
name = "card pack"
desc = "For those with disposible income."
icon_state = "card_pack"
icon = 'icons/obj/playing_cards.dmi'
icon_state = "card_pack"
drop_sound = 'sound/items/drop/paper.ogg'
w_class = 1
var/list/cards = list()
@@ -194,6 +195,7 @@
desc = "Some playing cards."
icon = 'icons/obj/playing_cards.dmi'
icon_state = "empty"
drop_sound = 'sound/items/drop/paper.ogg'
w_class = 1
var/concealed = 0