diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index dea8e4595f..4948f658e6 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -363,3 +363,39 @@ add_client_colour(G.glass_colour_type) else remove_client_colour(G.glass_colour_type) + +//VG rip + +/obj/item/clothing/glasses/sunglasses/purple + desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes, and the colored lenses let you see the world in purple." + name = "purple sunglasses" + icon_state = "sun_purple" + +/obj/item/clothing/glasses/sunglasses/star + name = "star-shaped sunglasses" + desc = "Novelty sunglasses, both lenses are in the shape of a star." + icon_state = "sun_star" + +/obj/item/clothing/glasses/sunglasses/rockstar + name = "red star-shaped sunglasses" + desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones." + icon_state = "sun_star_silver" + +/obj/item/clothing/glasses/gglasses + name = "Green Glasses" + desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." + icon_state = "gglasses" + item_state = "gglasses" + +/obj/item/clothing/glasses/welding/superior + name = "superior welding goggles" + desc = "Welding goggles made from more expensive materials, strangely smells like potatoes. Allows for better vision than normal goggles.." + icon_state = "rwelding-g" + item_state = "rwelding-g" + actions_types = list(/datum/action/item_action/toggle) + flash_protect = 2 + tint = 1 + visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT + flags_cover = GLASSESCOVERSEYES + visor_flags_inv = HIDEEYES + glass_colour_type = /datum/client_colour/glass_colour/green diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 90d56d5d7e..e606074aa7 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -55,3 +55,71 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = 0 armor = list(melee = 15, bullet = 35, laser = 35, energy = 20, bomb = 35, bio = 35, rad = 35, fire = 0, acid = 0) + +/obj/item/clothing/gloves/batmangloves + desc = "Used for handling all things bat related." + name = "batgloves" + icon_state = "bmgloves" + item_state = "bmgloves" + item_color = "bmgloves" + + +obj/item/clothing/gloves/bikergloves + name = "Biker's Gloves" + icon_state = "biker-gloves" + item_state = "biker-gloves" + item_color = "bikergloves" + +/obj/item/clothing/gloves/megagloves + desc = "Uncomfortably bulky armored gloves." + name = "DRN-001 Gloves" + icon_state = "megagloves" + item_state = "megagloves" + + +/obj/item/clothing/gloves/protogloves + desc = "Funcionally identical to the DRN-001 model's, but in red!" + name = "Prototype Gloves" + icon_state = "protogloves" + item_state = "protogloves" + + +/obj/item/clothing/gloves/megaxgloves + desc = "An upgrade to the DRN-001's gauntlets, retains the uncomfortable armor, but comes with white gloves!" + name = "Maverick Hunter gloves" + icon_state = "megaxgloves" + item_state = "megaxgloves" + + +/obj/item/clothing/gloves/joegloves + desc = "Large grey gloves, very similar to the Prototype's." + name = "Sniper Gloves" + icon_state = "joegloves" + item_state = "joegloves" + + +/obj/item/clothing/gloves/doomguy + desc = "" + name = "Doomguy's gloves" + icon_state = "doom" + item_state = "doom" + + +/obj/item/clothing/gloves/anchor_arms + name = "Anchor Arms" + desc = "When you're a jerk, everybody loves you." + icon_state = "anchorarms" + item_state = "anchorarms" + +/obj/item/clothing/gloves/neorussian + name = "neo-Russian gloves" + desc = "Utilizes a non-slip technology that allows you to never drop your precious bottles of vodka." + icon_state = "nr_gloves" + item_state = "nr_gloves" + + +/obj/item/clothing/gloves/neorussian/fingerless + name = "neo-Russian fingerless gloves" + desc = "For these tense combat situations when you just have to pick your nose." + icon_state = "nr_fgloves" + item_state = "nr_fgloves" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c7612dfd4d..3b5b00581b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -332,3 +332,83 @@ if(F.on) user.AddLuminosity(-F.brightness_on) SetLuminosity(F.brightness_on) + +/obj/item/clothing/head/helmet/dredd + name = "Judge Helmet" + desc = "Judge, Jury, and Executioner." + icon_state = "dredd-helmet" + item_state = "dredd-helmet" + armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20, fire = 50, acid = 50) + cold_protection = HEAD + min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT + heat_protection = HEAD + max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT + flags = STOPSPRESSUREDMAGE + strip_delay = 80 + dog_fashion = null + +/obj/item/clothing/head/helmet/aviatorhelmet + name = "Aviator Helmet" + desc = "Help the Bombardier!" + armor = list(melee = 25, bullet = 0, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0) + item_state = "aviator_helmet" + icon_state = "aviator_helmet" + +/obj/item/clothing/head/helmet/biker + name = "Biker's Helmet" + desc = "This helmet should protect you from russians and masked vigilantes." + armor = list(melee = 25, bullet = 15, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0) + icon_state = "biker_helmet" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + +/obj/item/clothing/head/helmet/richard + name = "Richard" + desc = "Do you like hurting people?" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + icon_state = "richard" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + +/obj/item/clothing/head/helmet/megahelmet + name = "DRN-001 Helmet" + desc = "The helmet of the DRN-001 model. A simple, sturdy blue helmet." + icon_state = "megahelmet" + item_state = "megahelmet" + siemens_coefficient = 1 + +/obj/item/clothing/head/helmet/protohelmet + name = "Prototype Helmet" + desc = "Shiny red helmet with white accents and a built in shaded visor that does absolutely nothing, nothing but look rad as hell." + icon_state = "protohelmet" + item_state = "protohelmet" + siemens_coefficient = 1 + +/obj/item/clothing/head/helmet/megaxhelmet + name = "Maverick Hunter Helmet" + desc = "Heavily armored upgrade to the DRN-001 model's helmet, now comes with a pointless red crystal thing!" + icon_state = "megaxhelmet" + item_state = "megaxhelmet" + siemens_coefficient = 1 + +/obj/item/clothing/head/helmet/joehelmet + name = "Sniper Helmet" + desc = "Helmet belonging to one of the many mass produced 'Joe' type robots." + icon_state = "joehelmet" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + item_state = "joehelmet" + siemens_coefficient = 1 + +/obj/item/clothing/head/helmet/doomguy + name = "Doomguy's helmet" + desc = "" + icon_state = "doom" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + item_state = "doom" + armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0) + siemens_coefficient = 1 + +/obj/item/clothing/head/helmet/neorussian + name = "neo-Russian helmet" + desc = "This piece of equipment can double as a pillow, a bowl, an emergency toilet, and sometimes as a helmet." + icon_state = "nr_helmet" + item_state = "nr_helmet" + diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 30767f2bcc..e41928c7ce 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -279,3 +279,80 @@ name = "magnificent crown" desc = "A crown worn by only the highest emperors of the land." icon_state = "fancycrown" + +/obj/item/clothing/head/stalhelm + name = "Stalhelm" + desc = "Ein Helm, um die Nazi-Interesse an fremden Raumstationen zu sichern." + icon_state = "stalhelm" + item_state = "stalhelm" + +/obj/item/clothing/head/panzer + name = "Panzer Cap" + desc = "Ein Hut passen nur für die größten Tanks." + icon_state = "panzercap" + item_state = "panzercap" + +/obj/item/clothing/head/naziofficer + name = "Officer Cap" + desc = "Ein Hut von Offizieren in der Nazi-Partei getragen." + icon_state = "officercap" + item_state = "officercap" + + +/obj/item/clothing/head/russobluecamohat + name = "russian blue camo beret" + desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food." + icon_state = "russobluecamohat" + item_state = "russobluecamohat" + +/obj/item/clothing/head/russofurhat + name = "russian fur hat" + desc = "Russian winter got you down? Maybe your enemy, but not you!" + icon_state = "russofurhat" + item_state = "russofurhat" + +/obj/item/clothing/head/squatter_hat + name = "slav squatter hat" + icon_state = "squatter_hat" + item_state = "squatter_hat" + desc = "Cyka blyat." + +/obj/item/clothing/head/snake + name = "snake head" + desc = "Reenact acts of violence against reptiles, or sneak into a swamp unnoticed." + icon_state = "snakehead" + item_state = "snakehead" + +/obj/item/clothing/head/mummy_rags + name = "mummy rags" + desc = "Ancient rags taken off from some mummy." + icon_state = "mummy" + item_state = "mummy" + item_color = "mummy" + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/head/clownpiece + name = "Clownpiece's jester hat" + desc = "A purple polka-dotted jester's hat with yellow pompons." + icon_state = "clownpiece" + item_state = "clownpiece" + +/obj/item/clothing/head/mitre + name = "mitre" + desc = "A funny hat worn by extremely boring people." + icon_state = "mitre" + item_state = "mitre" + +/obj/item/clothing/head/tinfoil + name = "tinfoil hat" + desc = "There's no evidence that the security staff is NOT out to get you." + icon_state = "foilhat" + item_state = "paper" + siemens_coefficient = 2 + +/obj/item/clothing/head/celtic + name = "\improper Celtic crown" + desc = "According to legend, Celtic kings would use crowns like this one to shield their subjects from harsh winters back on Earth." + icon_state = "celtic_crown" + item_state = "celtic_crown" + diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 46de85d61a..04dfbfe9cd 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -200,4 +200,19 @@ /obj/item/clothing/mask/bandana/skull name = "skull bandana" desc = "A fine black bandana with nanotech lining and a skull emblem." - icon_state = "bandskull" \ No newline at end of file + icon_state = "bandskull" + +/obj/item/clothing/mask/gas/clown_hat/wiz + name = "purple clown wig and mask" + desc = "Some pranksters are truly magical." + icon_state = "wizzclown" + +/obj/item/clothing/mask/chapmask + name = "venetian mask" + desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut." + icon_state = "chapmask" + +/obj/item/clothing/mask/neorussian + name = "neo-Russian mask" + desc = "Somehow, it makes you act and look way more polite than usual." + icon_state = "nr_mask" diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index b714d8eb11..5f34684c00 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -111,3 +111,9 @@ user << "You need help taking these off!" return ..() + +/obj/item/clothing/shoes/leather + name = "leather shoes" + desc = "A sturdy pair of leather shoes." + icon_state = "leather" + item_color = "leather" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index da3df123b2..063b3fbb91 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -59,3 +59,18 @@ icon_state = "syndiemag0" magboot_state = "syndiemag" origin_tech = "magnets=4;syndicate=2" + +/obj/item/clothing/shoes/magboots/deathsquad + desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle." + name = "deathsquad magboots" + icon_state = "DS-magboots0" + magboot_state = "DS-magboots" + origin_tech = null + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + +/obj/item/clothing/shoes/magboots/atmos + desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These are painted in the colors of an atmospheric technician." + name = "atmospherics magboots" + icon_state = "atmosmagboots0" + magboot_state = "atmosmagboots" +resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 693fec80cb..4102ac16fe 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -214,4 +214,97 @@ name = "blue performer's boots" desc = "These boots were made for dancing." icon_state = "bsing" - put_on_delay = 50 \ No newline at end of file + put_on_delay = 50 + + +/obj/item/clothing/shoes/simonshoes + name = "Simon's Shoes" + desc = "Simon's Shoes." + icon_state = "simonshoes" + + + +/obj/item/clothing/shoes/kneesocks + name = "kneesocks" + desc = "A pair of girly knee-high socks." + icon_state = "kneesock" + + +/obj/item/clothing/shoes/jestershoes + name = "Jester Shoes" + desc = "As worn by the clowns of old." + icon_state = "jestershoes" + + + +/obj/item/clothing/shoes/aviatorboots + name = "Aviator Boots" + desc = "Boots suitable for just about any occasion." + icon_state = "aviator_boots" + + + +/obj/item/clothing/shoes/libertyshoes + name = "Liberty Shoes" + desc = "Freedom isn't free, neither were these shoes." + icon_state = "libertyshoes" + + + +/obj/item/clothing/shoes/megaboots + name = "DRN-001 Boots" + desc = "Large armored boots, very weak to large spikes." + icon_state = "megaboots" + + + +/obj/item/clothing/shoes/protoboots + name = "Prototype Boots" + desc = "Functionally identical to the DRN-001 model's boots, but in red." + icon_state = "protoboots" + + + +/obj/item/clothing/shoes/megaxboots + name = "Maverick Hunter boots" + desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike." + icon_state = "megaxboots" + + + +/obj/item/clothing/shoes/joeboots + name = "Sniper Boots" + desc = "Nearly identical to the Prototype's boots, except in black." + icon_state = "joeboots" + + + +/obj/item/clothing/shoes/doomguy + name = "Doomguy's boots" + desc = "" + icon_state = "doom" + + + +/obj/item/clothing/shoes/rottenshoes + name = "rotten shoes" + desc = "These shoes seem perfect for sneaking around." + icon_state = "rottenshoes" + + + +/obj/item/clothing/shoes/sandal/slippers + name = "magic slippers" + icon_state = "slippers" + desc = "For the wizard that puts comfort first. Who's going to laugh?" + +/obj/item/clothing/shoes/slippers_worn + name = "worn bunny slippers" + desc = "Fluffy..." + icon_state = "slippers_worn" + + +/obj/item/clothing/shoes/jackboots/neorussian + name = "neo-Russian boots" + desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit." + icon_state = "nr_boots" diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 775245d678..cdaaa7d1de 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -721,3 +721,109 @@ strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT actions_types = list() + + +/obj/item/clothing/head/helmet/space/hardsuit/nazi + name = "nazi hardhelmet" + desc = "This is the face of das vaterland's top elite. Gas or energy are your only escapes." + item_state = "hardsuit0-nazi" + icon_state = "hardsuit0-nazi" + armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) + item_color = "nazi" + +/obj/item/clothing/suit/space/hardsuit/nazi + name = "nazi hardsuit" + desc = "The attire of a true krieger. All shall fall, and only das vaterland will remain." + item_state = "hardsuit-nazi" + icon_state = "hardsuit-nazi" + slowdown = 1 + armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) + allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/nazi + +/obj/item/clothing/head/helmet/space/hardsuit/soviet + name = "soviet hardhelmet" + desc = "Crafted with the pride of the proletariat. The vengeful gaze of the visor roots out all fascists and capitalists." + item_state = "hardsuit0-soviet" + icon_state = "hardsuit0-soviet" + armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) + item_color = "soviet" + +/obj/item/clothing/suit/space/hardsuit/soviet + name = "soviet hardsuit" + desc = "Crafted with the pride of the proletariat. The last thing the enemy sees is the bottom of this armor's boot." + item_state = "hardsuit-soviet" + icon_state = "hardsuit-soviet" + slowdown = 1 + armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) + allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet + +/obj/item/clothing/head/helmet/space/hardsuit/knight + name = "Space-Knight helm" + desc = "A well polished helmet belonging to a Space-Knight. Favored by space-jousters for its ability to stay on tight after being launched from a mass driver." + icon_state = "hardsuit0-knight" + item_state = "hardsuit0-knight" + armor = list(melee = 60, bullet = 40, laser = 40,energy = 30, bomb = 50, bio = 100, rad = 60) + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + item_color="knight" + +/obj/item/clothing/suit/space/hardsuit/knight + name = "Space-Knight armour" + desc = "A well polished set of armour belonging to a Space-Knight. Maidens Rescued in Space: 100, Maidens who have slept with me in Space: 0." + icon_state = "hardsuit-knight" + item_state = "hardsuit-knight" + slowdown = 1 + allowed = list(/obj/item/weapon/gun,/obj/item/weapon/melee/baton,/obj/item/weapon/tank,/obj/item/weapon/shield/energy,/obj/item/weapon/claymore) + armor = list(melee = 60, bullet = 40, laser = 40,energy = 30, bomb = 50, bio = 100, rad = 60) + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + siemens_coefficient = 0.5 + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight + +/obj/item/clothing/head/helmet/space/hardsuit/knight/black + name = "Black Knight's helm" + desc = "An ominous black helmet with a gold trim. The small viewports create an intimidating look, while also making it nearly impossible to see anything." + icon_state = "hardsuit0-blackknight" + item_state = "hardsuit0-blackknight" + armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60) + item_color="blackknight" + +/obj/item/clothing/suit/space/hardsuit/knight/black + name = "Black Knight's armour" + desc = "An ominous black suit of armour with a gold trim. Surprisingly good at preventing accidental loss of limbs." + icon_state = "hardsuit-blackknight" + item_state = "hardsuit-blackknight" + armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight/black + +/obj/item/clothing/head/helmet/space/hardsuit/knight/solaire + name = "Solar helm" + desc = "A simple helmet. 'Made in Astora' is inscribed on the back." + icon_state = "hardsuit0-solaire" + item_state = "hardsuit0-solaire" + armor = list(melee = 60, bullet = 65, laser = 90,energy = 30, bomb = 60, bio = 100, rad = 100) + item_color="solaire" + +/obj/item/clothing/suit/space/hardsuit/knight/solaire + name = "Solar armour" + desc = "A solar powered hardsuit with a fancy insignia on the chest. Perfect for stargazers and adventurers alike." + icon_state = "hardsuit-solaire" + item_state = "hardsuit-solaire" + armor = list(melee = 60, bullet = 65, laser = 90,energy = 30, bomb = 60, bio = 100, rad = 100) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight/solaire + +/obj/item/clothing/head/helmet/space/hardsuit/t51b + name = "T-51b Power Armor" + desc = "Relic of a bygone era, the T-51b is powered by a TX-28 MicroFusion Pack, which holds enough fuel to power its internal hydraulics for a century!" + icon_state = "hardsuit0-t51b" + item_state = "hardsuit0-t51b" + armor = list(melee = 35, bullet = 35, laser = 40, energy = 40, bomb = 80, bio = 100, rad = 100) + item_color="t51b" + +/obj/item/clothing/suit/space/hardsuit/t51b + name = "T-51b Power Armor" + desc = "Relic of a bygone era, the T-51b is powered by a TX-28 MicroFusion Pack, which holds enough fuel to power its internal hydraulics for a century!" + icon_state = "hardsuit-t51b" + item_state = "hardsuit-t51b" + armor = list(melee = 35, bullet = 35, laser = 40, energy = 40, bomb = 80, bio = 100, rad = 100) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/t51b diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 870cbecfc1..b8e075150c 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -308,3 +308,21 @@ Contains: desc = "Peering into the eyes of the helmet is enough to seal damnation." icon_state = "hardsuit0-beserker" item_state = "hardsuit0-beserker" + +/obj/item/clothing/head/helmet/space/bomberman + name = "Bomberman head" + desc = "Terrorism has never looked so adorable." + icon_state = "bomberman" + item_state = "bomberman" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0) + siemens_coefficient = 0 + +obj/item/clothing/suit/space/bomberman + name = "Bomberman's suit" + desc = "Doesn't actually make you immune to bombs!" + icon_state = "bomberman" + item_state = "bomberman" + slowdown = 0 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0) + siemens_coefficient = 0 + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a3160c0383..afe9d3d6da 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -403,3 +403,44 @@ desc = "God wills it!" icon_state = "knight_templar" item_state = "knight_templar" + +/obj/item/clothing/suit/armor/xcomsquaddie + name = "Squaddie Armor" + desc = "A suit of armor with heavy padding to protect against projectile and laser attacks. Distributed to shadow organization squaddies." + icon_state = "xcomarmor2" + item_state = "xcomarmor2" + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(melee = 10, bullet = 50, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.5 + +/obj/item/clothing/suit/armor/xcomsquaddie/dredd + name = "Judge Armor" + desc = "A large suit of heavy armor, fit for a Judge." + icon_state = "dredd-suit" + item_state = "dredd-suit" + + +/obj/item/clothing/suit/armor/xcomarmor + name = "Mysterious Armor" + desc = "A suit of armor with heavy plating to protect against melee attacks. Distributed to shadow organization squaddies." + icon_state = "xcomarmor1" + item_state = "xcomarmor1" + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(melee = 50, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) + slowdown = 1 + siemens_coefficient = 0.5 + +/obj/item/clothing/suit/armor/vest/neorussian + name = "neo-Russian vest" + desc = "The narkotiki camo pattern will come useful for botany raids." + icon_state = "nr_vest" + item_state = "nr_vest" + +/obj/item/clothing/suit/armor/doomguy + name = "Doomguy's armor" + desc = "" + icon_state = "doom" + item_state = "doom" + body_parts_covered = CHEST|GROIN + slowdown = 0 + armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d3fd7c8438..ef1f23e1a1 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -535,3 +535,57 @@ icon_state = "bedsheet" user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = 1, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire + +/obj/item/clothing/suit/kaminacape + name = "Kamina's Cape" + desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." + icon_state = "kaminacape" + body_parts_covered = 0 + +/obj/item/clothing/suit/officercoat + name = "Officer's Coat" + desc = "Ein Mantel gemacht, um die Juden zu bestrafen." + icon_state = "officersuit" + body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + +/obj/item/clothing/suit/soldiercoat + name = "Soldier's Coat" + desc = "Und das heißt: Erika." + icon_state = "soldiersuit" + body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + +/obj/item/clothing/suit/russofurcoat + name = "russian fur coat" + desc = "Let the land do the fighting for you." + icon_state = "russofurcoat" + allowed = list(/obj/item/weapon/gun) + body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + +/obj/item/clothing/suit/doshjacket + name = "Plasterer's Jacket" + desc = "Perfect for doing up the house." + icon_state = "doshjacket" + body_parts_covered = CHEST|GROIN|ARMS + +/obj/item/clothing/suit/maidapron + name = "Apron" + desc = "Simple white apron." + icon_state = "maidapron" + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/suit/clownpiece + name = "small fairy wings" + desc = "Some small and translucid insect-like wings." + icon_state = "clownpiece" + body_parts_covered = 0 + +/obj/item/clothing/suit/clownpiece/flying + name = "small fairy wings" + desc = "Some small and translucid insect-like wings. Looks like these are the real deal!" + icon_state = "clownpiece-fly" + +/obj/item/clothing/suit/raincoat + name = "Raincoat" + desc = "Do you like Huey Lewis and the News?" + icon_state = "raincoat" + body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 0434ddc5ec..142d58bb23 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -132,3 +132,11 @@ item_state = "blueshift" item_color = "blueshift" can_adjust = 0 + +/obj/item/clothing/under/rank/security/sneaksuit + name = "sneaking suit" + desc = "It's made of a strong material developed by the Soviet Union centuries ago which provides robust protection." + icon_state = "sneakingsuit" + item_state = "sneakingsuit" + item_color = "sneakingsuit" + can_adjust = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e57989c871..bdb28854d1 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -654,3 +654,321 @@ icon_state = "hostanclothes" item_state = "hostanclothes" item_color = "hostanclothes" + +/obj/item/clothing/under/stripper_pink + name = "pink stripper outfit" + icon_state = "stripper_p" + item_state = "stripper_p" + item_color = "stripper_p" + can_adjust = 0 + +/obj/item/clothing/under/stripper_green + name = "green stripper outfit" + icon_state = "stripper_g" + item_state = "stripper_g" + item_color = "stripper_g" + can_adjust = 0 + + +/obj/item/clothing/under/wedding/bride_orange + name = "orange wedding dress" + desc = "A big and puffy orange dress." + icon_state = "bride_orange" + item_state = "bride_orange" + item_color = "bride_orange" + can_adjust = 0 + +/obj/item/clothing/under/wedding/bride_purple + name = "purple wedding dress" + desc = "A big and puffy purple dress." + icon_state = "bride_purple" + item_state = "bride_purple" + item_color = "bride_purple" + can_adjust = 0 + +/obj/item/clothing/under/wedding/bride_blue + name = "blue wedding dress" + desc = "A big and puffy blue dress." + icon_state = "bride_blue" + item_state = "bride_blue" + item_color = "bride_blue" + can_adjust = 0 + +/obj/item/clothing/under/wedding/bride_red + name = "red wedding dress" + desc = "A big and puffy red dress." + icon_state = "bride_red" + item_state = "bride_red" + item_color = "bride_red" + can_adjust = 0 + +/obj/item/clothing/under/wedding/bride_white + name = "white wedding dress" + desc = "A white wedding gown made from the finest silk." + icon_state = "bride_white" + item_state = "bride_white" + item_color = "bride_white" + can_adjust = 0 + +/obj/item/clothing/under/mankini + name = "pink mankini" + icon_state = "mankini" + item_state = "mankini" + item_color = "mankini" + can_adjust = 0 + +/obj/item/clothing/under/psysuit + name = "dark undersuit" + desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." + icon_state = "psysuit" + item_state = "psysuit" + item_color = "psysuit" + can_adjust = 0 + +/obj/item/clothing/under/officeruniform + name = "officer's uniform" + desc = "Bestraft die Juden fur ihre Verbrechen." + icon_state = "officeruniform" + item_state = "officeruniform" + item_color = "officeruniform" + can_adjust = 0 + +/obj/item/clothing/under/soldieruniform + name = "soldier's uniform" + desc = "Bestraft die Verbundeten fur ihren Widerstand." + icon_state = "soldieruniform" + item_state = "soldieruniform" + item_color = "soldieruniform" + can_adjust = 0 + +/obj/item/clothing/under/squatter_outfit + name = "slav squatter tracksuit" + desc = "Cyka blyat." + icon_state = "squatteroutfit" + item_state = "squatteroutfit" + item_color = "squatteroutfit" + can_adjust = 0 + +/obj/item/clothing/under/russobluecamooutfit + name = "russian blue camo" + desc = "Drop and give me dvadtsat!" + icon_state = "russobluecamo" + item_state = "russobluecamo" + item_color = "russobluecamo" + can_adjust = 0 + +/obj/item/clothing/under/stilsuit + name = "stillsuit" + desc = "Designed to preserve bodymoisture." + icon_state = "stilsuit" + item_state = "stilsuit" + item_color = "stilsuit" + can_adjust = 0 + +/obj/item/clothing/under/aviatoruniform + name = "aviator uniform" + desc = "Now you can look absolutely dashing!" + icon_state = "aviator_uniform" + item_state = "aviator_uniform" + item_color = "aviator_uniform" + can_adjust = 0 + +/obj/item/clothing/under/bikersuit + name = "biker's outfit" + icon_state = "biker" + item_state = "biker" + item_color = "biker" + can_adjust = 0 + +/obj/item/clothing/under/jacketsuit + name = "richard's outfit" + desc = "Do you know what time it is?" + icon_state = "jacket" + item_state = "jacket" + item_color = "jacket" + can_adjust = 0 + +obj/item/clothing/under/mega + name = "\improper DRN-001 suit" + desc = "The original. Simple, yet very adaptable." + icon_state = "mega" + item_state = "mega" + item_color = "mega" + can_adjust = 0 + +/obj/item/clothing/under/proto + name = "The Prototype Suit" + desc = "Even robots know scarves are the perfect accessory for a brooding rival." + icon_state = "proto" + item_state = "proto" + item_color = "proto" + can_adjust = 0 + +/obj/item/clothing/under/megax + name = "\improper Maverick Hunter regalia" + desc = "The best outfit for taking out rogue borgs." + icon_state = "megax" + item_state = "megax" + item_color = "megax" + can_adjust = 0 + +/obj/item/clothing/under/joe + name = "The Sniper Suit" + desc = "Mass produced combat robots with a rather unfitting name." + icon_state = "joe" + item_state = "joe" + item_color = "joe" + can_adjust = 0 + +/obj/item/clothing/under/roll + name = "\improper DRN-002 Dress" + desc = "A simple red dress, the good doctor's second robot wasn't quite as exciting as the first." + icon_state = "roll" + item_state = "roll" + item_color = "roll" + can_adjust = 0 + +/obj/item/clothing/under/gokugidown + name = "turtle hermit undershirt" + desc = "Something seems oddly familiar about this outfit..." + icon_state = "gokugidown" + item_state = "gokugidown" + item_color = "gokugidown" + can_adjust = 0 + +/obj/item/clothing/under/gokugi + name = "turtle hermit outfit" + desc = "An outfit from one trained by the great Turtle Hermit." + icon_state = "gokugi" + item_state = "gokugi" + item_color = "gokugi" + can_adjust = 0 + +/obj/item/clothing/under/doomguy + name = "\improper Doomguy's pants" + desc = "" + icon_state = "doom" + item_state = "doom" + item_color = "doom" + can_adjust = 0 + +/obj/item/clothing/under/vault13 + name = "vault 13 Jumpsuit" + desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it. Has a large thirteen emblazened on the back." + icon_state = "v13-jumpsuit" + item_state = "v13-jumpsuit" + item_color = "v13-jumpsuit" + can_adjust = 0 + +/obj/item/clothing/under/vault + name = "vault jumpsuit" + desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it." + icon_state = "v-jumpsuit" + item_state = "v-jumpsuit" + item_color = "v-jumpsuit" + can_adjust = 0 + +/obj/item/clothing/under/clownpiece + name = "Clownpiece's Pierrot suit" + desc = "A female-sized set of leggings and shirt with a pattern similar to the American flag, featuring a frilled collar." + icon_state = "clownpiece" + item_state = "clownpiece" + item_color = "clownpiece" + can_adjust = 0 + +/obj/item/clothing/under/cia + name = "casual IAA outfit" + desc = "Just looking at this makes you feel in charge." + icon_state = "cia" + item_state = "cia" + item_color = "cia" + can_adjust = 0 + +/obj/item/clothing/under/greaser + name = "greaser outfit" + desc = "The one that you want!" + icon_state = "greaser_default" + item_state = "greaser_default" + can_adjust = 0 + +/obj/item/clothing/under/greaser/New() + var/greaser_colour = "default" + switch(rand(1,4)) + if(1) + greaser_colour = "default" + if(2) + greaser_colour = "cult" + if(3) + greaser_colour = "spider" + if(4) + greaser_colour = "snakes" + desc = "Tunnel Snakes Rule!" + icon_state = "greaser_[greaser_colour]" + item_state = "greaser_[greaser_colour]" + item_color = "greaser_[greaser_colour]" + can_adjust = 0 + +/obj/item/clothing/under/wintercasualwear + name = "winter casualwear" + desc = "Perfect for winter!" + icon_state = "shizunewinter" + item_state = "shizunewinter" + item_color = "shizunewinter" + can_adjust = 0 + + +/obj/item/clothing/under/casualwear + name = "spring casualwear" + desc = "Perfect for spring!" + icon_state = "shizunenormal" + item_state = "shizunenormal" + item_color = "shizunenormal" + can_adjust = 0 + +/obj/item/clothing/under/keyholesweater + name = "keyhole sweater" + desc = "What is the point of this, anyway?" + icon_state = "keyholesweater" + item_state = "keyholesweater" + item_color = "keyholesweater" + can_adjust = 0 + +/obj/item/clothing/under/casualhoodie + name = "casual hoodie" + desc = "Pefect for lounging about in." + icon_state = "hoodiejeans" + item_state = "hoodiejeans" + item_color = "hoodiejeans" + can_adjust = 0 + + +/obj/item/clothing/under/casualhoodie/skirt + icon_state = "hoodieskirt" + item_state = "hoodieskirt" + item_color = "hoodieskirt" + can_adjust = 0 + +/obj/item/clothing/under/mummy_rags + name = "mummy rags" + desc = "Ancient rags taken off from some mummy." + icon_state = "mummy" + item_state = "mummy" + item_color = "mummy" + can_adjust = 0 + has_sensor = 0 + +/obj/item/clothing/under/neorussian + name = "neo-Russian uniform" + desc = "Employs a special toshnit pattern, will render you invisible when you eat a potato on an empty stomach." + icon_state = "nr_uniform" + item_state = "nr_uniform" + item_color = "nr_uniform" + can_adjust = 0 + +/obj/item/clothing/under/rottensuit + name = "rotten suit" + desc = "This suit seems perfect for wearing underneath a disguise." + icon_state = "rottensuit" + item_state = "rottensuit" + item_color = "rottensuit" + can_adjust = 0 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 740573b2a5..0b108f96ee 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 062dc0b486..45b635daa4 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index dfe487caa8..b23b278360 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d5af755f21..551ffec32c 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 b86c548b77..770c51d55d 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 009d91ef4c..00a40b3d5a 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 6313ef058e..0114e13b11 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 93702b3b42..8c46f04e95 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index fd078d775c..a5fe713855 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 72adf533b6..7e71c74b9b 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 7a3c416b94..a227c02e54 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 90e4ee5332..42e4a75ae8 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 8153bf780a..db64e3cc20 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 2963275eea..430aadb50c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ