cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG_Port

Browse Source 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
This commit is contained in:
SinTwo
2015-10-11 00:58:26 -04:00
committed by Neerti
parent 24d9545790
commit ec58f7c705
38 changed files with 276 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/helmet.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/obj/item/clothing/head/helmet
name = "helmet"
desc = "Standard Security gear. Protects the head from impacts. This one has a adjustable visor."
icon_state = "helmet"
icon_state = "helmet_new"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
@@ -19,7 +19,7 @@
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
desc = "It's a helmet specifically designed to protect against close range attacks."
icon_state = "riot"
icon_state = "riot_new"
armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS
siemens_coefficient = 0.7
@@ -44,7 +44,7 @@
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
desc = "They're often used by highly trained SWAT Members."
icon_state = "swat"
icon_state = "swat_new"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
code/modules/clothing/masks/miscellaneous.dm
+35
View File
@@ -144,3 +144,38 @@
eye.owner.eyeobj = null
eye.owner = null
/obj/item/clothing/mask/bandana
name = "black bandana"
desc = "A fine black bandana with nanotech lining."
w_class = 1
flags = MASKCOVERSMOUTH
flags_inv = HIDEFACE
slot_flags = SLOT_MASK
icon_state = "bandblack"
item_state = null
/obj/item/clothing/mask/bandana/red
name = "red bandana"
desc = "A fine red bandana with nanotech lining."
icon_state = "bandred"
/obj/item/clothing/mask/bandana/blue
name = "blue bandana"
desc = "A fine blue bandana with nanotech lining."
icon_state = "bandblue"
/obj/item/clothing/mask/bandana/green
name = "green bandana"
desc = "A fine green bandana with nanotech lining."
icon_state = "bandgreen"
/obj/item/clothing/mask/bandana/gold
name = "gold bandana"
desc = "A fine gold bandana with nanotech lining."
icon_state = "bandgold"
/obj/item/clothing/mask/bandana/skull
name = "skull bandana"
desc = "A fine black bandana with nanotech lining and a skull emblem."
icon_state = "bandskull"
code/modules/clothing/shoes/miscellaneous.dm
+10
View File
@@ -192,3 +192,13 @@
item_flags = NOSLIP
slowdown = SHOES_SLOWDOWN+1
species_restricted = null
/obj/item/clothing/shoes/winterboots
name = "winter boots"
desc = "Boots lined with 'synthetic' animal fur."
icon_state = "winterboots"
item_state = "winterboots"
cold_protection = FEET|LEGS
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
code/modules/clothing/suits/armor.dm
+25
View File
@@ -19,6 +19,12 @@
blood_overlay_type = "armor"
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/vest/alt
name = "security armor"
desc = "An armored vest that protects against some damage. This one has a NanoTrasen corporate badge."
icon_state = "armoralt"
item_state = "armoralt"
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
desc = "An armored vest that protects against some damage. This one has a corporate badge."
@@ -32,6 +38,13 @@
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/armor/vest/warden/alt
name = "Warden's jacket"
desc = "An armoured jacket with silver rank pips and livery."
icon_state = "warden_alt"
item_state = "warden_alt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/suit/armor/riot
name = "Riot Suit"
@@ -44,6 +57,11 @@
flags_inv = HIDEJUMPSUIT
siemens_coefficient = 0.5
/obj/item/clothing/suit/armor/riot/alt
name = "Riot Suit"
desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
icon_state = "riot_new"
item_state = "riot_new"
/obj/item/clothing/suit/armor/bulletproof
name = "Bulletproof Vest"
@@ -54,6 +72,13 @@
armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/suit/armor/bulletproof/alt
name = "Bulletproof Vest"
desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles."
icon_state = "bulletproof_new"
item_state = "bulletproof_new"
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/laserproof
name = "Ablative Armor Vest"
desc = "A vest that excels in protecting the wearer against energy projectiles."
code/modules/clothing/suits/labcoat.dm
+8
View File
@@ -117,3 +117,11 @@
icon_state = "labcoat_tox_open"
icon_open = "labcoat_tox_open"
icon_closed = "labcoat_tox"
/obj/item/clothing/suit/storage/toggle/labcoat/emt
name = "EMT's labcoat"
desc = "A dark blue labcoat with reflective strips for emergency medical technicians."
icon_state = "labcoat_emt_open"
item_state = "labcoat_emt"
icon_open = "labcoat_emt_open"
icon_closed = "labcoat_emt"
code/modules/clothing/suits/miscellaneous.dm
+47
View File
@@ -217,6 +217,18 @@
icon_state = "leathercoat"
item_state = "leathercoat"
/obj/item/clothing/suit/leathercoat/alt
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat_alt"
item_state = "leathercoat_alt"
/obj/item/clothing/suit/leathercoat/alt/sec
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat_sec"
item_state = "leathercoat_sec"
/obj/item/clothing/suit/browncoat
name = "brown leather coat"
desc = "A long, brown leather coat."
@@ -337,6 +349,24 @@
icon_state = "blueponcho"
item_state = "blueponcho"
/obj/item/clothing/suit/jacket/puffer
name = "puffer jacket"
desc = "A thick jacket with a rubbery, water-resistant shell."
icon_state = "pufferjacket"
item_state = "pufferjacket"
/obj/item/clothing/suit/jacket/puffer/vest
name = "puffer vest"
desc = "A thick vest with a rubbery, water-resistant shell."
icon_state = "puffervest"
item_state = "puffervest"
/obj/item/clothing/suit/jacket/miljacket
name = "military jacket"
desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket"
item_state = "militaryjacket"
/obj/item/clothing/suit/storage/toggle/bomber
name = "bomber jacket"
desc = "A thick, well-worn WW2 leather bomber jacket."
@@ -349,6 +379,16 @@
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.7
/obj/item/clothing/suit/storage/bomber/alt
name = "bomber jacket"
desc = "A thick, well-worn WW2 leather bomber jacket."
icon_state = "bomberjacket_new"
item_state = "bomberjacket_new"
body_parts_covered = UPPER_TORSO|ARMS
cold_protection = UPPER_TORSO|ARMS
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.7
/obj/item/clothing/suit/storage/leather_jacket
name = "leather jacket"
desc = "A black leather coat."
@@ -356,6 +396,13 @@
item_state = "leather_jacket"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/leather_jacket/alt
name = "leather jacket"
desc = "A black leather coat."
icon_state = "leather_jacket_alt"
item_state = "leather_jacket_alt"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen
desc = "A black leather coat. A corporate logo is proudly displayed on the back."
icon_state = "leather_jacket_nt"
code/modules/clothing/under/accessories/accessory.dm
+64 -2
View File
@@ -16,7 +16,7 @@
if(!inv_overlay)
if(!mob_overlay)
get_mob_overlay()
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
if(icon_override)
if("[tmp_icon_state]_tie" in icon_states(icon_override))
@@ -181,4 +181,66 @@
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
desc = "An extremely rare golden medal awarded only by company officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
//Scarves
/obj/item/clothing/accessory/scarf
name = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
/obj/item/clothing/accessory/scarf/red
name = "red scarf"
icon_state = "redscarf"
/obj/item/clothing/accessory/scarf/green
name = "green scarf"
icon_state = "greenscarf"
/obj/item/clothing/accessory/scarf/darkblue
name = "dark blue scarf"
icon_state = "darkbluescarf"
/obj/item/clothing/accessory/scarf/purple
name = "purple scarf"
icon_state = "purplescarf"
/obj/item/clothing/accessory/scarf/yellow
name = "yellow scarf"
icon_state = "yellowscarf"
/obj/item/clothing/accessory/scarf/orange
name = "orange scarf"
icon_state = "orangescarf"
/obj/item/clothing/accessory/scarf/lightblue
name = "light blue scarf"
icon_state = "lightbluescarf"
/obj/item/clothing/accessory/scarf/white
name = "white scarf"
icon_state = "whitescarf"
/obj/item/clothing/accessory/scarf/black
name = "black scarf"
icon_state = "blackscarf"
/obj/item/clothing/accessory/scarf/zebra
name = "zebra scarf"
icon_state = "zebrascarf"
/obj/item/clothing/accessory/scarf/christmas
name = "christmas scarf"
icon_state = "christmasscarf"
/obj/item/clothing/accessory/stripedredscarf
name = "striped red scarf"
icon_state = "stripedredscarf"
/obj/item/clothing/accessory/stripedgreenscarf
name = "striped green scarf"
icon_state = "stripedgreenscarf"
/obj/item/clothing/accessory/stripedbluescarf
name = "striped blue scarf"
icon_state = "stripedbluescarf"
code/modules/clothing/under/miscellaneous.dm
+49
View File
@@ -278,6 +278,55 @@
/obj/item/clothing/under/dress
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/dress/blacktango
name = "black tango dress"
desc = "Filled with Latin fire."
icon_state = "black_tango"
item_state = "black_tango"
worn_state = "black_tango"
/obj/item/clothing/under/dress/blacktango/alt
name = "black tango dress"
desc = "Filled with Latin fire."
icon_state = "black_tango_alt"
item_state = "black_tango_alt"
worn_state = "black_tango_alt"
/obj/item/clothing/under/dress/stripeddress
name = "striped dress"
desc = "Fashion in space."
icon_state = "striped_dress"
item_state = "striped_dress"
worn_state = "striped_dress"
/obj/item/clothing/under/dress/sailordress
name = "sailor dress"
desc = "Formal wear for a leading lady."
icon_state = "sailor_dress"
item_state = "sailor_dress"
worn_state = "sailor_dress"
/obj/item/clothing/under/dress/redeveninggown
name = "red evening gown"
desc = "Fancy dress for space bar singers."
icon_state = "red_evening_gown"
item_state = "red_evening_gown"
worn_state = "red_evening_gown"
/obj/item/clothing/under/dress/maid
name = "maid costume"
desc = "Maid in China."
icon_state = "maid"
item_state = "maid"
worn_state = "maid"
/obj/item/clothing/under/dress/janimaid
name = "maid uniform"
desc = "A simple maid uniform for housekeeping."
icon_state = "janimaid"
item_state = "janimaid"
worn_state = "janimaid"
/obj/item/clothing/under/dress/dress_fire
name = "flame dress"
desc = "A small black dress with blue flames print on it."
code/modules/mob/new_player/sprite_accessories.dm
+20
View File
@@ -57,6 +57,10 @@
name = "Short Hair" // try to capatilize the names please~
icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you
short2
name = "Short Hair 2"
icon_state = "hair_shorthair3"
resomi
name = "Resomi Plumage"
icon_state = "resomi_default"
@@ -140,10 +144,22 @@
name = "Ponytail 5"
icon_state = "hair_ponytail5"
ponytail6
name = "Ponytail 6"
icon_state = "hair_ponytail6"
sideponytail
name = "Side Ponytail"
icon_state = "hair_stail"
sideponytail2
name = "One Shoulder"
icon_state = "hair_oneshoulder"
sideponytail3
name = "Tress Shoulder"
icon_state = "hair_tressshoulder"
parted
name = "Parted"
icon_state = "hair_parted"
@@ -186,6 +202,10 @@
icon_state = "hair_bobcut"
species_allowed = list("Human","Unathi")
bun
name = "Bun"
icon_state = "hair_bun"
bowl
name = "Bowl"
icon_state = "hair_bowlcut"