diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 9926f3a7bc7..08d9b5b857d 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -47,7 +47,7 @@ name = "Syndicate Operative" suit = /obj/item/clothing/suit/space/void/merc - belt = /obj/item/weapon/storage/belt/military + belt = /obj/item/weapon/storage/belt/military/syndicate head = /obj/item/clothing/head/helmet/space/void/merc mask = /obj/item/clothing/mask/gas/syndicate l_ear = /obj/item/device/radio/headset/syndicate @@ -240,7 +240,7 @@ /datum/outfit/admin/pirate name = "Pirate" - + uniform = /obj/item/clothing/under/pirate shoes = /obj/item/clothing/shoes/brown head = /obj/item/clothing/head/bandana @@ -250,7 +250,7 @@ /datum/outfit/admin/spacepirate name = "Space Pirate" - + uniform = /obj/item/clothing/under/pirate suit = /obj/item/clothing/suit/space/pirate shoes = /obj/item/clothing/shoes/brown @@ -341,7 +341,7 @@ /datum/outfit/admin/random_employee name = "Random Employee" - + /datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) @@ -399,7 +399,7 @@ /datum/gear/eyes/glasses/fakesun )) H.equip_or_collect(new path(), slot_glasses) - + if(prob(20)) //Equip some gloves var/datum/gear/G = gear_datums["gloves selection"] H.equip_or_collect(G.spawn_random(), slot_gloves) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index fe322ee6416..11d05f96d74 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -192,7 +192,7 @@ /obj/item/weapon/storage/belt/military name = "military belt" - desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear." + desc = "A lightweight, quick to use, military belt. Designed to be comfortably worn even during lengthy military operations." icon_state = "militarybelt" item_state = "militarybelt" storage_slots = 9 //same as a combat belt now @@ -224,6 +224,11 @@ /obj/item/stack/telecrystal ) +/obj/item/weapon/storage/belt/military/syndicate + desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear." + icon_state = "militarybelt_syndie" + item_state = "militarybelt_syndie" + /obj/item/weapon/storage/belt/janitor name = "janibelt" desc = "A belt used to hold most janitorial supplies." diff --git a/code/modules/antag_contest/sol_items.dm b/code/modules/antag_contest/sol_items.dm index eaab3739be8..b758ae104c4 100644 --- a/code/modules/antag_contest/sol_items.dm +++ b/code/modules/antag_contest/sol_items.dm @@ -39,6 +39,27 @@ item_state = "marine_fatigue" contained_sprite = 1 +/obj/item/clothing/under/rank/fatigues/Initialize() + .=..() + rolled_sleeves = 0 + +/obj/item/clothing/under/rank/fatigues/rollsleeves() + set name = "Roll Up Sleeves" + set category = "Object" + set src in usr + + if (use_check(usr, USE_DISALLOW_SILICONS)) + return + + rolled_sleeves = !rolled_sleeves + if(rolled_sleeves) + body_parts_covered &= ~(ARMS|HANDS) + item_state = "[item_state]_r_s" + else + body_parts_covered = initial(body_parts_covered) + item_state = initial(item_state) + update_clothing_icon() + /obj/item/clothing/under/rank/service //navy personnel service unniform name = "sol navy service uniform" desc = "Military looking service uniform issued to Sol Alliance navy members." @@ -183,6 +204,26 @@ item_state = "marineofficersword" contained_sprite = 1 +//vest and helmet + +/obj/item/clothing/head/helmet/sol + name = "sol combat helmet" + desc = "A woodland colored helmet made from advanced ceramic." + icon = 'icons/obj/sol_uniform.dmi' + icon_state = "helmet_tac_sol" + item_state = "helmet_tac_sol" + armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + contained_sprite = 1 + +/obj/item/clothing/suit/storage/vest/sol + name = "sol heavy armor vest" + desc = "A high-quality armor vest in a deep green. It is surprisingly flexible and light, even with the added webbing and armor plating." + icon = 'icons/obj/sol_uniform.dmi' + icon_state = "solwebvest" + item_state = "solwebvest" + armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + contained_sprite = 1 + //closet uniform /obj/structure/closet/sol diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 3d1de78056c..ff506ff7598 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -4,6 +4,10 @@ slot = slot_head sort_category = "Hats and Headwear" +/datum/gear/head/ushanka_grey + display_name = "ushanka, grey" + path = /obj/item/clothing/head/ushanka/grey + /datum/gear/head/bandana display_name = "bandana selection" path = /obj/item/clothing/head/bandana diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 922a3c5fdbb..f4e8b46298d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -231,6 +231,10 @@ coat["military jacket, green"] = /obj/item/clothing/suit/storage/miljacket/green gear_tweaks += new/datum/gear_tweak/path(coat) +/datum/gear/suit/legion_jacket + display_name = "Tau Ceti Foreign Legion jacket" + path = /obj/item/clothing/suit/storage/legion + /datum/gear/suit/miscellaneous/engi_dep_jacket display_name = "department jacket, engineering" path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b9584fdd659..cb5a645a7cf 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -178,7 +178,6 @@ BLIND // can't see anything item_flags = AIRTIGHT unacidable = 1 - /obj/item/clothing/glasses/eyepatch name = "eyepatch" desc = "Yarr." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 124dda154f9..be37e413b53 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -159,13 +159,13 @@ name = "tactical helmet" desc = "An armored helmet capable of being fitted with a multitude of attachments." icon_state = "swathelm" + flags_inv = HIDEEARS|BLOCKHAIR sprite_sheets = list( "Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi' ) - armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0) - flags_inv = HIDEEARS + /obj/item/clothing/head/helmet/augment name = "augment array" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b089621ce31..cabba8a73ba 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -116,17 +116,25 @@ */ /obj/item/clothing/head/ushanka name = "ushanka" - desc = "Perfect for winter in Siberia, da?" - icon_state = "ushankadown" + desc = "A warm fur hat with ear flaps that can be raised and tied to be out of the way." + icon_state = "ushanka" flags_inv = HIDEEARS + var/earsup = 0 + +/obj/item/clothing/head/ushanka/grey + name = "grey ushanka" + desc = "Perfect for winter in Siberia, da?" + icon_state = "greyushanka" /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) - if(src.icon_state == "ushankadown") - src.icon_state = "ushankaup" + src.earsup = !src.earsup + if(src.earsup) + icon_state = "[icon_state]_up" to_chat(user, "You raise the ear flaps on the ushanka.") else - src.icon_state = "ushankadown" + src.icon_state = initial(icon_state) to_chat(user, "You lower the ear flaps on the ushanka.") + update_clothing_icon() /* * Pumpkin head diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 4c165d960b1..71a1be0c565 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -26,10 +26,15 @@ update_clothing_icon() /obj/item/clothing/mask/balaclava/tactical - name = "green balaclava" + name = "white balaclava" desc = "Designed to both hide identities and keep your face comfy and warm." icon_state = "swatclava" +/obj/item/clothing/mask/balaclava/military + name = "green balaclava" + desc = "Designed to both hide identities and keep your face comfy and warm." + icon_state = "milclava" + /obj/item/clothing/mask/balaclava/iacmask name = "IAC balaclava" desc = "Designed to keep the user warm and sterile in hostile enviroments." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 7a33101895b..379d962f5cf 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -484,6 +484,12 @@ icon_state = "militaryjacket_green" item_state = "militaryjacket_green" +/obj/item/clothing/suit/storage/legion + name = "tcfl jacket" + desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Foreign Legion." + icon_state = "tcfljacket" + item_state = "tcfljacket" + /obj/item/clothing/suit/jacket/puffer name = "puffer jacket" desc = "A thick jacket with a rubbery, water-resistant shell. Oddly enough, you don't feel any heat." diff --git a/html/changelogs/[Ferner]-[280419-sprites_amory].yml b/html/changelogs/[Ferner]-[280419-sprites_amory].yml new file mode 100644 index 00000000000..dd9a2cd2308 --- /dev/null +++ b/html/changelogs/[Ferner]-[280419-sprites_amory].yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: AmoryBlaine, Ferner + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added new sprites for the tactical gear available in cargo. Added new green sprite fro the military belt. Improved the sprite of the ushanka, the old one is available as a variant. Adds a TCFL jacket to the loadout. Made the sleeves rollable on two sol uniforms, added sol tactical helmet, sol heavy armor vest." + - imageadd: "Changed the look of most flipped caps, Made the visors of biosuits and eyes of tactical gasmasks transparent. Hip holster was made black. Tweaked the red and blue bandanas to be less bright. Changed the look of rolled up balaclavas. Changed the look of some security berets." + - maptweak: "Replaced the armoury from a generic to a security specific one. Replaced the armoury gas masks with the transparent ones." diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 6bac5b9c53d..70b1389a038 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index e1377ed018d..e9d037ac382 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index d750d282536..d3c003d8635 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 42e9c970dd1..428232fd8ef 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index b2745dfeee6..6ba841d2331 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 969a0bc311e..b92ea5296d0 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index 2df21e7f1ee..eda0ee5c8dc 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 1f201e78f27..babf912a450 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 8a0a98c8f60..1f828848fba 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 4b913dcd0ef..216e66c2f96 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 9d391853152..3dca3d82a72 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 29b605bf352..fd3ac1d4764 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 8fd295c1345..e2aa4c056cd 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2fda936df8f..c11827aaea1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index e2882b9c6be..f9852626696 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 397c2dbfe46..310da5db897 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 8a0b8841285..398b924e5a7 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/sol_uniform.dmi b/icons/obj/sol_uniform.dmi index a7f75ca1e00..721357ea372 100644 Binary files a/icons/obj/sol_uniform.dmi and b/icons/obj/sol_uniform.dmi differ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e5e5351b6f0..eb84f1b929c 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -946,6 +946,10 @@ /obj/item/weapon/book/manual/ntsl2, /turf/simulated/floor/wood, /area/library) +"abY" = ( +/obj/structure/closet/l3closet/security, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "abZ" = ( /obj/structure/cable/green{ d2 = 4; @@ -6034,10 +6038,6 @@ /obj/structure/closet/bombclosetsecurity, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"alE" = ( -/obj/structure/closet/l3closet/general, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) "alF" = ( /obj/machinery/light{ dir = 1 @@ -7859,21 +7859,21 @@ /area/maintenance/engineering) "apb" = ( /obj/structure/table/rack, -/obj/item/clothing/mask/gas{ +/obj/item/clothing/mask/gas/alt{ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/mask/gas{ +/obj/item/clothing/mask/gas/alt{ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ +/obj/item/clothing/mask/gas/alt, +/obj/item/clothing/mask/gas/alt, +/obj/item/clothing/mask/gas/alt{ pixel_x = 3; pixel_y = -3 }, -/obj/item/clothing/mask/gas{ +/obj/item/clothing/mask/gas/alt{ pixel_x = 3; pixel_y = -3 }, @@ -93784,7 +93784,7 @@ afo aab ajR ajR -alE +abY amO anT apc