diff --git a/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm b/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm index 04170de5119..88f8214a612 100644 --- a/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm +++ b/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm @@ -1247,6 +1247,7 @@ var/list/arcane_tomes = list() name = "magus helm" icon_state = "magus" item_state = "magus" + species_fit = list(INSECT_SHAPED) desc = "A helm." flags = FPRINT body_parts_covered = FULL_HEAD|BEARD diff --git a/code/datums/gamemode/factions/legacy_cult/cult_items.dm b/code/datums/gamemode/factions/legacy_cult/cult_items.dm index 28ff97123f5..5fa51d631b8 100644 --- a/code/datums/gamemode/factions/legacy_cult/cult_items.dm +++ b/code/datums/gamemode/factions/legacy_cult/cult_items.dm @@ -76,6 +76,7 @@ name = "magus helm" icon_state = "magus" item_state = "magus" + species_fit = list(INSECT_SHAPED) desc = "A helm worn by the followers of Nar-Sie." flags = FPRINT body_parts_covered = FULL_HEAD|BEARD diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index c1a0cab84ad..d6e27c825d7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -901,9 +901,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "cone" item_state = "cone" - - species_fit = list(VOX_SHAPED) - + species_fit = list(VOX_SHAPED, INSECT_SHAPED) body_parts_covered = HEAD w_class = W_CLASS_LARGE slot_flags = SLOT_HEAD diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b95eac78a2a..541edd893d6 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -238,9 +238,9 @@ icon_state = "fireworkslauncher" item_state = "riotgun" fire_sound = "sound/weapons/railgun_lowpower.ogg" - projectile_type = "/obj/item/projectile/meteor/firework" + projectile_type = "/obj/item/projectile/meteor/firework" charge_cost = 0 //infinite ammo! - + /obj/item/weapon/gun/energy/fireworkslauncher/update_icon() return @@ -1537,6 +1537,7 @@ name = "balloon hat" desc = "Just like the ones made in the sweatshops of the clown planet." icon_state = "hat_balloon" + species_fit = list(INSECT_SHAPED) slot_flags = SLOT_HEAD on_body_layer = HEAD_LAYER diff --git a/code/game/objects/items/trader.dm b/code/game/objects/items/trader.dm index e2b71cc9cdd..f10dec963c0 100644 --- a/code/game/objects/items/trader.dm +++ b/code/game/objects/items/trader.dm @@ -232,6 +232,7 @@ var/global/list/alcatraz_stuff = list( desc = "The Donutgiver III. A twenty-five sprinkle headgear with mission-variable voice-programmed confections. It has the words SPRINKLE, JELLY, CHAOS and FAVORITE etched onto its sides." icon_state = "helmet_sec" item_state = "helmet" + species_fit = list(INSECT_SHAPED) flags = HEAR | FPRINT var/dna_profile = null var/last_donut = 0 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index e5f432d00a1..e5215b4ade7 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -202,6 +202,7 @@ /obj/item/trash/chicken_bucket name = "chicken bucket" icon_state = "kfc_bucket" + species_fit = list(INSECT_SHAPED) starting_materials = list(MAT_CARDBOARD = 3750) w_type=RECYK_MISC armor = list(melee = 1, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index fd95cb911dc..4d992a800f1 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -66,7 +66,7 @@ icon = 'icons/obj/trash.dmi' icon_state = "plasticbag" item_state = "plasticbag" - + species_fit = list(INSECT_SHAPED) w_class = W_CLASS_LARGE fits_max_w_class = W_CLASS_SMALL storage_slots = 21 @@ -585,7 +585,7 @@ var/global/list/plantbag_colour_choices = list("plantbag", "green red stripe", " origin_tech = Tc_MATERIALS + "=1;" + Tc_ENGINEERING + "=1" storage_slots = 50 fits_max_w_class = 3 - max_combined_w_class = 200 + max_combined_w_class = 200 w_class = W_CLASS_TINY can_only_hold = list("/obj/item/slime_extract","/obj/item/weapon/slimenutrient","/obj/item/weapon/slimesteroid", "/obj/item/weapon/slimepotion", "/obj/item/weapon/slimepotion2", "/obj/item/weapon/slimesteroid2", "/obj/item/weapon/slimeres", "/obj/item/weapon/slimedupe") display_contents_with_number = TRUE diff --git a/code/modules/clothing/head/beanies.dm b/code/modules/clothing/head/beanies.dm index f0f6c1d0095..73c83fcf0df 100644 --- a/code/modules/clothing/head/beanies.dm +++ b/code/modules/clothing/head/beanies.dm @@ -4,6 +4,7 @@ name = "white beanie" desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads." icon_state = "beanie" //Default white + species_fit = list(INSECT_SHAPED) clothing_flags = COLORS_OVERLAY /obj/item/clothing/head/beanie/black diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index f20e48d8a68..d9db5a04add 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -5,6 +5,7 @@ /obj/item/clothing/head/collectable name = "collectable hat" desc = "A rare collectable hat." + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/collectable/petehat name = "ultra rare Pete's hat!" @@ -60,7 +61,7 @@ desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!" icon_state = "welding" item_state = "welding" - species_fit = list(VOX_SHAPED) + species_fit = list(VOX_SHAPED, INSECT_SHAPED) /obj/item/clothing/head/collectable/slime name = "collectable slime hat" @@ -85,6 +86,7 @@ desc = "The fur feels.....a bit too realistic." icon_state = "kitty" item_state = "kitty" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/collectable/rabbitears name = "collectable rabbit ears" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index be2f3aa6260..c717449f590 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -9,13 +9,14 @@ heat_conductivity = HELMET_HEAT_CONDUCTIVITY max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 - species_fit = list(GREY_SHAPED) + species_fit = list(GREY_SHAPED, INSECT_SHAPED) /obj/item/clothing/head/helmet/visor name = "visor helmet" desc = "For when you need to protect your face from the backblast of your pepperspray" icon_state = "riot_helm" item_state = "riot_helm" + species_fit = list(INSECT_SHAPED) armor = list(melee = 50, bullet = 25, laser = 45, energy = 15, bomb = 30, bio = 0, rad = 0) var/list/initial_armor = list() actions_types = list(/datum/action/item_action/toggle_helmet) @@ -99,6 +100,7 @@ name = "\improper Thunderdome helmet" desc = "'Let the battle commence!'" icon_state = "thunderdome" + species_fit = list(INSECT_SHAPED) flags = FPRINT item_state = "thunderdome" armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) @@ -108,6 +110,7 @@ name = "gladiator helmet" desc = "Ave, Imperator, morituri te salutant." icon_state = "gladiator" + species_fit = list(INSECT_SHAPED) flags = FPRINT item_state = "gladiator" siemens_coefficient = 1 @@ -118,6 +121,7 @@ armor = list(melee = 20, bullet = 0, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0) icon_state = "roman" item_state = "roman" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD|EARS|MASKHEADHAIR /obj/item/clothing/head/helmet/roman/legionaire @@ -126,6 +130,7 @@ armor = list(melee = 25, bullet = 0, laser = 25, energy = 10, bomb = 10, bio = 0, rad = 0) icon_state = "roman_c" item_state = "roman_c" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD|EARS /obj/item/clothing/head/helmet/samurai @@ -134,6 +139,7 @@ armor = list(melee = 40, bullet = 0, laser = 10, energy = 10, bomb = 10, bio = 0, rad = 0) icon_state = "kabuto" item_state = "kabuto" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD|EARS|MASKHEADHAIR /obj/item/clothing/head/helmet/aviatorhelmet @@ -142,6 +148,7 @@ armor = list(melee = 25, bullet = 0, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0) item_state = "aviator_helmet" icon_state = "aviator_helmet" + species_fit = list(INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED) /obj/item/clothing/head/helmet/piratelord @@ -155,6 +162,7 @@ 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" + species_fit = list(INSECT_SHAPED) body_parts_covered = FULL_HEAD|BEARD|MASKHEADHAIR /obj/item/clothing/head/helmet/richard @@ -162,12 +170,14 @@ 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" + species_fit = list(INSECT_SHAPED) body_parts_covered = FULL_HEAD|BEARD|MASKHEADHAIR /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" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = HEAD|EARS|MASKHEADHAIR item_state = "megahelmet" @@ -178,6 +188,7 @@ 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" + species_fit = list(INSECT_SHAPED) flags = FPRINT item_state = "protohelmet" siemens_coefficient = 1 @@ -186,6 +197,7 @@ name = "Broken Helmet" desc = "The product of twelve years of work by an eccentric and brilliant loner. A helmet belonging to the perfect man; an unbeatable machine." icon_state = "breakhelmet" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = FULL_HEAD|BEARD|MASKHEADHAIR item_state = "breakhelmet" @@ -214,6 +226,7 @@ name = "Sniper Helmet" desc = "Helmet belonging to one of the many mass produced 'Joe' type robots." icon_state = "joehelmet" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = FULL_HEAD|BEARD|MASKHEADHAIR item_state = "joehelmet" @@ -243,6 +256,7 @@ desc = "A classic metal helmet." icon_state = "knight_green" item_state = "knight_green" + species_fit = list(INSECT_SHAPED) body_parts_covered = FULL_HEAD|BEARD|MASKHEADHAIR armor = list(melee = 20, bullet = 5, laser = 2,energy = 2, bomb = 2, bio = 2, rad = 0) flags = FPRINT @@ -251,20 +265,24 @@ /obj/item/clothing/head/helmet/knight/blue icon_state = "knight_blue" item_state = "knight_blue" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/helmet/knight/yellow icon_state = "knight_yellow" item_state = "knight_yellow" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/helmet/knight/red icon_state = "knight_red" item_state = "knight_red" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/helmet/knight/templar name = "crusader helmet" desc = "Deus Vult." icon_state = "knight_templar" item_state = "knight_templar" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/helmet/knight/interrogator name = "interrogator helmet" @@ -286,6 +304,7 @@ desc = "A fancy helmet for a fancy policeman." icon_state = "police_helmet" item_state = "police_helmet" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD /obj/item/clothing/head/helmet/chainmail @@ -293,6 +312,7 @@ desc = "chains fashioned together to be a hood to wear over your head" icon_state = "chainmail_head" item_state = "chainmail_head" + species_fit = list(INSECT_SHAPED) armor = list(melee = 10, bullet = 15, laser = 2,energy = 2, bomb = 2, bio = 2, rad = 0) flags = FPRINT siemens_coefficient = 1 @@ -302,6 +322,7 @@ desc = "You feel arrogant and important just by wearing it." icon_state = "snail_helm" item_state = "snail_helm" + species_fit = list(INSECT_SHAPED) armor = list(melee = 10, bullet = 5, laser = 2,energy = 2, bomb = 2, bio = 2, rad = 0) inhand_states = list("left_hand" = 'icons/mob/in-hand/left/hats.dmi', "right_hand" = 'icons/mob/in-hand/right/hats.dmi') flags = FPRINT @@ -312,5 +333,5 @@ desc = "Attention, ground units. Anti-citizen reported in this community." icon_state = "metrocop_helmet" item_state = "helmet" + species_fit = list(INSECT_SHAPED) body_parts_covered = FULL_HEAD - species_fit = list() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index cc69e8aa35d..5767273fea0 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -4,6 +4,7 @@ desc = "a stylish hat for a stylish stylist." icon_state = "barber" item_state = "barber" + species_fit = list(INSECT_SHAPED) flags = FPRINT siemens_coefficient = 0.9 @@ -50,7 +51,7 @@ body_parts_covered = HEAD|EARS heat_conductivity = HELMET_HEAT_CONDUCTIVITY max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - species_fit = list() + species_fit = list(INSECT_SHAPED) siemens_coefficient = 0.8 /obj/item/clothing/head/HoS/dermal @@ -64,6 +65,7 @@ name = "formal Head of Security beret" desc = "A navy beret with a Head of Security rank insignia on it. For formal occasions." icon_state = "hosberet" + species_fit = list(INSECT_SHAPED) //Warden /obj/item/clothing/head/warden @@ -80,6 +82,7 @@ name = "formal warden beret" desc = "A navy beret with a Warden rank insignia on it. For formal occasions." icon_state = "wardenberet" + species_fit = list(INSECT_SHAPED) //Head of Personnel /obj/item/clothing/head/hopcap @@ -96,6 +99,7 @@ name = "chaplain's hood" desc = "It's hood that covers the head. It keeps you warm during the space winters." icon_state = "chaplain_hood" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR siemens_coefficient = 0.9 @@ -104,6 +108,7 @@ name = "nun hood" desc = "Maximum piety in this star system." icon_state = "nun_hood" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR siemens_coefficient = 0.9 @@ -128,42 +133,50 @@ name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." icon_state = "beret_badge" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/beret/officer name = "formal security officer beret" desc = "A navy beret with a Security Officer rank insignia on it. For formal occasions." icon_state = "officerberet" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/peaked name = "peaked cap" desc = "A red peaked cap, with a corporate logo on it." icon_state = "peaked" item_state = "peaked" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/garrison name = "garrison cap" desc = "A squat garrison cap, for officers made of sterner stuff." icon_state = "garrison" item_state = "garrison" + species_fit = list(INSECT_SHAPED) //Medical /obj/item/clothing/head/surgery name = "surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR /obj/item/clothing/head/surgery/purple desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple." icon_state = "surgcap_purple" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/surgery/blue desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue." icon_state = "surgcap_blue" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/surgery/green desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green." icon_state = "surgcap_green" + species_fit = list(INSECT_SHAPED) // Reference: http://www.teuse.net/personal/harrington/hh_bible.htm // http://www.trmn.org/portal/images/uniforms/rmn/rmn_officer_srv_dress_lrg.png @@ -174,11 +187,13 @@ name = "officers beret" desc = "A black beret adorned with the shield (a silver kite shield with an engraved sword) of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen." icon_state = "centcomofficerberet" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/beret/centcom/captain name = "captains beret" desc = "A white beret adorned with the shield (a cobalt kite shield with an engraved sword) of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy." icon_state = "centcomcaptain" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/shoes/centcom name = "dress shoes" @@ -188,4 +203,4 @@ /obj/item/clothing/head/beret/engineering name = "engineering beret" desc = "A yellow-orange beret with a white insignia." - icon_state = "e_beret_badge" \ No newline at end of file + icon_state = "e_beret_badge" diff --git a/code/modules/clothing/head/leather.dm b/code/modules/clothing/head/leather.dm index ae8fb1b950d..0f439422cde 100644 --- a/code/modules/clothing/head/leather.dm +++ b/code/modules/clothing/head/leather.dm @@ -4,6 +4,7 @@ flags = FPRINT icon_state = "helmet_leather" item_state = "helmet_leather" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD|EARS armor = list(melee = 30, bullet = 10, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0) heat_conductivity = SNOWGEAR_HEAT_CONDUCTIVITY @@ -35,6 +36,7 @@ desc = "Who was a good boy?" icon_state = "helmet_leather_corgi" item_state = "helmet_leather_corgi" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/leather/deer name = "deer pelt head cover" @@ -42,6 +44,7 @@ body_parts_covered = HEAD|EARS|MOUTH icon_state = "helmet_leather_deerNH" item_state = "helmet_leather_deerNH" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/leather/deer/attackby(obj/W, mob/user) if(istype (W, /obj/item/antlers)) @@ -57,6 +60,7 @@ desc = "Made to help you blend in and stalk deer. Perfect for headbutting people with." icon_state = "helmet_leather_deer" item_state = "helmet_leather_deer" + species_fit = list(INSECT_SHAPED) armor = list(melee = 35, bullet = 10, laser = 20, energy = 10, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/head/leather/xeno @@ -64,7 +68,8 @@ desc = "A brutal attempt at using a brutal combatant as armor." icon_state = "helmet_leather_xeno" item_state = "helmet_leather_xeno" + species_fit = list(INSECT_SHAPED) armor = list(melee = 40, bullet = 25, laser = 30, energy = 25, bomb = 15, bio = 20, rad = 20) /obj/item/clothing/head/leather/xeno/acidable() - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3148d65871d..c5766ac7b6d 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -3,6 +3,7 @@ /obj/item/clothing/head/centhat name = "\improper CentComm. hat" icon_state = "centcom" + species_fit = list(INSECT_SHAPED) desc = "It's good to be emperor." flags = FPRINT item_state = "centhat" @@ -11,6 +12,7 @@ /obj/item/clothing/head/hairflower name = "hair flower pin" icon_state = "hairflower" + species_fit = list(INSECT_SHAPED) desc = "Smells nice." item_state = "hairflower" flags = FPRINT @@ -20,12 +22,14 @@ desc = "A powdered wig." icon_state = "pwig" item_state = "pwig" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/that name = "top hat" desc = "It's an amish looking hat." icon_state = "tophat" item_state = "that" + species_fit = list(INSECT_SHAPED) flags = FPRINT siemens_coefficient = 0.9 wizard_garb = 5 //Treat this as a % chance to be a magic hat to start. It becomes TRUE/FALSE later. @@ -74,6 +78,7 @@ name = "plague doctor's hat" desc = "These were once used by Plague doctors. They're pretty much useless." icon_state = "plaguedoctor" + species_fit = list(INSECT_SHAPED) flags = FPRINT permeability_coefficient = 0.01 siemens_coefficient = 0.9 @@ -83,6 +88,7 @@ name = "hastur's hood" desc = "It's unspeakably stylish." icon_state = "hasturhood" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR body_parts_visible_override = FACE @@ -91,12 +97,14 @@ desc = "A golden chain circlet which gives the impression of a halo." icon_state = "vamphunter" item_state = "vamphunter" + species_fit = list(INSECT_SHAPED) body_parts_covered = NONE /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" + species_fit = list(INSECT_SHAPED) flags = FPRINT siemens_coefficient = 0.9 @@ -123,6 +131,7 @@ name = "cueball helmet" desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?" icon_state = "cueball" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = FULL_HEAD|BEARD|HIDEHEADHAIR item_state="cueball" @@ -132,6 +141,7 @@ desc = "It's a green bandana with some fine nanotech lining." icon_state = "greenbandana" item_state = "greenbandana" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/beret/highlander @@ -139,6 +149,7 @@ desc = "Don't lose your head!" icon_state = "highlanderberet" item_state = "highlanderberet" + species_fit = list(INSECT_SHAPED) wizard_garb = 1 //required for the spell in the highlander syndicate bundle /obj/item/clothing/head/cardborg @@ -146,6 +157,7 @@ desc = "A helmet made out of a box." icon_state = "cardborg_h" item_state = "cardborg_h" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR starting_materials = list(MAT_CARDBOARD = 3750) @@ -183,6 +195,7 @@ name = "rabbit ears" desc = "Wearing these makes you looks useless, and only good for your sex appeal." icon_state = "bunny" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/flatcap @@ -190,6 +203,7 @@ desc = "A working man's cap." icon_state = "flat_cap" item_state = "detective" + species_fit = list(INSECT_SHAPED) siemens_coefficient = 0.9 /obj/item/clothing/head/pirate @@ -197,6 +211,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/hgpiratecap name = "pirate hat" @@ -210,12 +225,14 @@ desc = "Yarr." icon_state = "bandana" item_state = "bandana" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/sith name = "Sith Cowl" desc = "UNLIMITED POWER!" icon_state = "sith" item_state = "sith" + species_fit = list(INSECT_SHAPED) wizard_garb = 1 //Allows lightning to be used //stylish bs12 hats @@ -232,6 +249,7 @@ name = "beaver hat" icon_state = "beaver_hat" item_state = "beaver_hat" + species_fit = list(INSECT_SHAPED) desc = "Like a top hat, but made of beavers." flags = FPRINT @@ -247,6 +265,7 @@ name = "slav squatter hat" icon_state = "squatter_hat" item_state = "squatter_hat" + species_fit = list(INSECT_SHAPED) desc = "Cyka blyat." flags = FPRINT @@ -285,11 +304,13 @@ /obj/item/clothing/head/fedora/white name = "white fedora" icon_state = "fedora_white" + species_fit = list(INSECT_SHAPED) desc = "A great white hat ruined by being within fifty yards of you." /obj/item/clothing/head/fedora/brown name = "brown fedora" icon_state = "fedora_brown" + species_fit = list(INSECT_SHAPED) desc = "Don't you even think about losing it." /obj/item/clothing/head/fez @@ -307,6 +328,7 @@ desc = "Eeeee~heheheheheheh!" icon_state = "witch" item_state = "witch" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR siemens_coefficient = 2.0 @@ -315,6 +337,7 @@ desc = "Bkaw!" icon_state = "chickenhead" item_state = "chickensuit" + species_fit = list(INSECT_SHAPED) body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR siemens_coefficient = 2.0 @@ -323,6 +346,7 @@ desc = "Not as fuzzy as the real thing." icon_state = "bearpelt" item_state = "bearpelt" + species_fit = list(INSECT_SHAPED) body_parts_covered = EARS|HEAD|HIDEHEADHAIR siemens_coefficient = 2.0 @@ -344,6 +368,7 @@ name = "xenos helmet" icon_state = "xenos" item_state = "xenos_helm" + species_fit = list(INSECT_SHAPED) desc = "A helmet made out of chitinous alien hide." body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR siemens_coefficient = 2.0 @@ -353,6 +378,7 @@ desc = "No one cares who you are until you put on the mask." icon_state = "bmhead" item_state = "bmhead" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = HEAD|EARS|EYES @@ -361,6 +387,7 @@ desc = "Ein Helm, um die Nazi-Interesse an fremden Raumstationen zu sichern." icon_state = "stalhelm" item_state = "stalhelm" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/panzer @@ -368,6 +395,7 @@ desc = "Ein Hut passen nur für die größten Tanks." icon_state = "panzercap" item_state = "panzercap" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/naziofficer @@ -375,6 +403,7 @@ desc = "Ein Hut von Offizieren in der Nazi-Partei getragen." icon_state = "officercap" item_state = "officercap" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/russobluecamohat @@ -382,6 +411,7 @@ desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food." icon_state = "russobluecamohat" item_state = "russobluecamohat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/russofurhat @@ -389,6 +419,7 @@ desc = "Russian winter got you down? Maybe your enemy, but not you!" icon_state = "russofurhat" item_state = "russofurhat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/lordadmiralhat @@ -396,12 +427,14 @@ desc = "A hat suitable for any man of high and exalted rank." icon_state = "lordadmiralhat" item_state = "lordadmiralhat" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/jesterhat name = "jester hat" desc = "A hat fit for a fool." icon_state = "jesterhat" item_state = "jesterhat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/libertyhat @@ -409,6 +442,7 @@ desc = "Show everyone just how patriotic you are." icon_state = "libertyhat" item_state = "libertyhat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/maidhat @@ -416,6 +450,7 @@ desc = "Do these even do anything besides look cute?" icon_state = "maidhat" item_state = "maidhat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/maidhat @@ -423,6 +458,7 @@ desc = "Do these even do anything besides look cute?" icon_state = "maidhat" item_state = "maidhat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/mitre @@ -430,18 +466,21 @@ desc = "A funny hat worn by extremely boring people." icon_state = "mitre" item_state = "mitre" + species_fit = list(INSECT_SHAPED) /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" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/headband name = "head band" desc = "You wear this around your head." icon_state = "headband" item_state = "headband" + species_fit = list(INSECT_SHAPED) inhand_states = list("left_hand" = 'icons/mob/in-hand/left/metalgear.dmi', "right_hand" = 'icons/mob/in-hand/right/metalgear.dmi') /obj/item/clothing/head/cowboy @@ -449,6 +488,7 @@ desc = "Perfect for the closet botanist." icon_state = "cowboy" item_state = "cowboy" + species_fit = list(INSECT_SHAPED) armor = list(melee = 0, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/christmas/santahat/red @@ -456,17 +496,20 @@ desc = "Not quite as magical as the real thing, but it flops over one ear and itches your head just the same." icon_state = "santahatred" item_state = "santahatred" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/christmas/santahat/green name = "green santa hat" desc = "Not quite as magical as the real thing, but it flops over one ear and itches your head just the same." icon_state = "santahatgreen" item_state = "santahatgreen" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/festive name = "festive paper hat" icon_state = "xmashat" item_state = "xmashat" + species_fit = list(INSECT_SHAPED) desc = "A crappy paper hat that you are REQUIRED to wear." flags = FPRINT armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) @@ -479,10 +522,12 @@ /obj/item/clothing/head/pajamahat/red icon_state = "pajamahat_red" item_state = "pajamahat_red" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/pajamahat/blue icon_state = "pajamahat_blue" item_state = "pajamahat_blue" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/mummy_rags name = "mummy rags" @@ -496,23 +541,27 @@ desc = "A conical paper hat which used to be used as a punishment in schools. Misbehaving children had to wear it while standing in a corner. The writing on it says \"DUNCE\"." icon_state = "duncecap" item_state = "duncecap" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/party_hat name = "party hat" desc = "A party cone. Not useful to disguise one's self as a unicorn or to impale one's foes." icon_state = "birthdayhat" item_state = "birthdayhat" + species_fit = list(INSECT_SHAPED) /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" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/clockwork_hood name = "clockwork hood" icon_state = "clockwork" item_state = "clockwork" + species_fit = list(INSECT_SHAPED) desc = "A hood worn by the followers of Ratvar." flags = FPRINT @@ -521,6 +570,7 @@ desc = "The result of extreme medical malpractice to save a patient, or a trip to the robotics lab." icon_state = "neckbolts" item_state = "neckbolts" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/alien_antenna @@ -528,6 +578,7 @@ desc = "Take us to your leader/captain/clown." icon_state = "antennae" item_state = "antennae" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/head/elfhat @@ -535,8 +586,8 @@ desc = "Wear this hat, and become one of Santa's little helpers!" icon_state = "elf_hat" item_state = "elf_hat" + species_fit = list(INSECT_SHAPED) body_parts_covered = HEAD|EARS - wizard_garb = 1 //being elf cursed wont prevent you casting robed spells if wizard /obj/item/clothing/head/elfhat/stickymagic @@ -547,6 +598,7 @@ desc = "Welcome to the rice fields, motherfucker." icon_state = "rice_hat" item_state = "rice_hat" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/rice_hat/ronin name = "Roningasa" @@ -559,6 +611,7 @@ desc = "A round wide-brimmed hat worn by more traditional Roman Catholic clergy." icon_state = "brim-hat" item_state = "brim-hat" + species_fit = list(INSECT_SHAPED) wizard_garb = TRUE armor = list(melee = 0, bullet = 0, laser = 15, energy = 15, bomb = 0, bio = 0, rad = 0) @@ -567,12 +620,14 @@ desc = "A red fancy looking wide-brimmed hat. It's even got a feather in it." icon_state = "widehat_red" item_state = "widehat_red" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/pharaoh name = "pharaoh's headpiece" desc = "An ornate golden headpiece worn by the ancient rulers of Space Egypt." icon_state = "pharaoh" item_state = "pharaoh" + species_fit = list(INSECT_SHAPED) wizard_garb = TRUE body_parts_covered = FULL_HEAD|HEAD|EARS|MASKHEADHAIR @@ -581,8 +636,10 @@ desc = "Meanwhile in Neo Space Mexico." icon_state = "sombrero" item_state = "sombrero" + species_fit = list(INSECT_SHAPED) /obj/item/clothing/head/donitos_pope name = "\improper Donitos Pope hat" desc = "An oversized Donitos promotional plastic donut-shaped hat." icon_state = "donitos_pope" + species_fit = list(INSECT_SHAPED) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index fdf7538f82f..80722605d5e 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -64,6 +64,7 @@ name = "cake-hat" desc = "It's tasty looking!" icon_state = "cake0" + species_fit = list(INSECT_SHAPED) flags = FPRINT body_parts_covered = HEAD|EYES light_power = 0.5 @@ -138,6 +139,7 @@ desc = "Davai, tovarish. Let us catch the capitalist greyshirt, and show him why it is that we proudly wear red!" icon_state = "ushankared" item_state = "ushankared" + species_fit = list(INSECT_SHAPED) armor = list(melee = 30, bullet = 15, laser = 25, energy = 10, bomb = 20, bio = 0, rad = 0) /obj/item/clothing/head/ushanka/hos @@ -155,6 +157,7 @@ desc = "A jack o' lantern! Believed to ward off evil spirits." icon_state = "hardhat0_pumpkin"//Could stand to be renamed item_state = "hardhat0_pumpkin" + species_fit = list(INSECT_SHAPED) _color = "pumpkin" flags = FPRINT body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR @@ -234,6 +237,7 @@ desc = "So many butts, so little time." icon_state = "butt" item_state = "butt" + species_fit = list(INSECT_SHAPED) flags = 0 force = 4.0 w_class = W_CLASS_TINY @@ -256,7 +260,7 @@ icon_state = "foilhat" item_state = "paper" siemens_coefficient = 2 - species_fit = list(GREY_SHAPED,VOX_SHAPED) + species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED) /obj/item/clothing/head/celtic name = "\improper Celtic crown" @@ -295,3 +299,4 @@ desc = "According to the manufacturer it was designed according to ancient ziggurat mound proportions used in votive worship. Like the mounds it collects energy and recirculates it. In this case the Dome collects energy that escapes from the crown of the human head and pushes it back into the medulla oblongata for increased mental energy." icon_state = "energy_dome" item_state = "energy_dome" + species_fit = list(INSECT_SHAPED) diff --git a/code/modules/clothing/head/tactical.dm b/code/modules/clothing/head/tactical.dm index 0773b258324..574e29ca533 100644 --- a/code/modules/clothing/head/tactical.dm +++ b/code/modules/clothing/head/tactical.dm @@ -22,7 +22,7 @@ name = "riot helmet" desc = "It's a helmet specifically designed to protect against close range attacks." icon_state = "riot" - species_fit = list(VOX_SHAPED) + species_fit = list(VOX_SHAPED, INSECT_SHAPED) flags = FPRINT armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) @@ -38,7 +38,7 @@ item_state = "swat" armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) heat_conductivity = INS_HELMET_HEAT_CONDUCTIVITY - species_fit = list(VOX_SHAPED, GREY_SHAPED) + species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED) pressure_resistance = 200 * ONE_ATMOSPHERE siemens_coefficient = 0.5 eyeprot = 1 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 90d743c20e4..1213780130a 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -24,6 +24,7 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" + species_fit = list(INSECT_SHAPED) flags = FPRINT /obj/item/clothing/suit/space/santa @@ -42,6 +43,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" + species_fit = list(INSECT_SHAPED) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.9 @@ -69,9 +71,10 @@ name = "ancient space helmet" icon_state = "nasa" item_state = "nasa" + species_fit = list(INSECT_SHAPED) desc = "Take your protein pills and put your helmet on." armor = list(melee = 10, bullet = 10, laser = 10,energy = 10, bomb = 50, bio = 100, rad = 100) - species_restricted =list("Human") + species_restricted =list("Human", "Insectoid") //Clown Space Suit /obj/item/clothing/head/helmet/space/clown @@ -79,6 +82,7 @@ desc = "The large grinning clown face on the front of the helmet is equal parts funny and creepy." icon_state = "clown-eva-helmet" item_state = "clown-eva-helmet" + species_fit = list(INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED) /obj/item/clothing/suit/space/clown @@ -119,4 +123,4 @@ icon_state = "syndicate-orange" item_state = "syndicate-orange" species_fit = list(VOX_SHAPED) - desc = "A Orange Space Suit meant to provide minimal space protection." \ No newline at end of file + desc = "A Orange Space Suit meant to provide minimal space protection." diff --git a/code/modules/clothing/spacesuits/rig_subtypes/rig_subtypes.dm b/code/modules/clothing/spacesuits/rig_subtypes/rig_subtypes.dm index 04e8194bc6c..2d561f406ad 100644 --- a/code/modules/clothing/spacesuits/rig_subtypes/rig_subtypes.dm +++ b/code/modules/clothing/spacesuits/rig_subtypes/rig_subtypes.dm @@ -193,7 +193,7 @@ icon_state = "rig0-wiz" item_state = "wiz_helm" _color = "wiz" - species_fit = list(GREY_SHAPED) + species_fit = list(GREY_SHAPED, INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED) armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.7 @@ -394,7 +394,7 @@ desc = "This is the face of das vaterland's top elite. Gas or energy are your only escapes." item_state = "rig0-nazi" icon_state = "rig0-nazi" - species_fit = list(GREY_SHAPED) + species_fit = list(GREY_SHAPED, INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED)//GAS THE VOX armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) _color = "nazi" @@ -418,7 +418,7 @@ desc = "Crafted with the pride of the proletariat. The vengeful gaze of the visor roots out all fascists and capitalists." item_state = "rig0-soviet" icon_state = "rig0-soviet" - species_fit = list(GREY_SHAPED) + species_fit = list(GREY_SHAPED, INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED)//HET armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20) _color = "soviet" @@ -610,6 +610,7 @@ desc = "...and so he left the asteroid, with everything but his humanity." icon_state = "rorhelm" item_state = "rorhelm" + species_fit = list(INSECT_SHAPED) armor = list(melee = 40, bullet = 0, laser = 0,energy = 0, bomb = 65, bio = 100, rad = 50) clothing_flags = GOLIATHREINFORCE diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index c484bf67bea..741656c1178 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -3,7 +3,7 @@ /obj/item/clothing/head/helmet/space/nasavoid name = "NASA Void Helmet" desc = "A high tech, NASA Centcom branch designed, dark red space suit helmet. Used for AI satellite maintenance." - species_fit = list(GREY_SHAPED) + species_fit = list(GREY_SHAPED, INSECT_SHAPED) species_restricted = list("exclude",VOX_SHAPED) icon_state = "void" item_state = "void" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index a5f087ba391..c621bd43589 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -67,7 +67,7 @@ body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR body_parts_visible_override = EYES siemens_coefficient = 0 - species_fit = list(VOX_SHAPED) + species_fit = list(VOX_SHAPED, INSECT_SHAPED) /obj/item/clothing/suit/bomb_suit name = "bomb suit" @@ -99,6 +99,7 @@ desc = "Use in case of very large bomb." icon_state = "advancedeod_helmet" item_state = "advancedeod_helmet" + species_fit = list(INSECT_SHAPED) flags = FPRINT armor = list(melee = 80, bullet = 80, laser = 40,energy = 20, bomb = 100, bio = 0, rad = 0) body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 0229c836be7..3f3475e326b 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -4,7 +4,7 @@ icon_state = "wizard" //Not given any special protective value since the magic robes are full-body protection --NEO siemens_coefficient = 0.8 - + species_fit = list(INSECT_SHAPED) wizard_garb = 1 /obj/item/clothing/head/wizard/red diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 846808a4ad4..f98add54866 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -181,6 +181,7 @@ desc = "This hat's been with you for some time now. It was a gift from your ex, and you wore it during the war. Thinking back on it, the war was prettier." icon_state = "detective_noir" item_state = "detective_noir" + species_fit = list(INSECT_SHAPED) /* * Head of Security */ diff --git a/code/modules/paperwork/paper_folded.dm b/code/modules/paperwork/paper_folded.dm index 4710b261a69..c0b7f1a6c6e 100644 --- a/code/modules/paperwork/paper_folded.dm +++ b/code/modules/paperwork/paper_folded.dm @@ -145,6 +145,7 @@ desc = "What looks like an ordinary paper hat, IS actually an ordinary paper hat, in no way collectible. Wow!" icon = 'icons/obj/clothing/hats.dmi' icon_state = "paper" + species_fit = list(INSECT_SHAPED) slot_flags = SLOT_HEAD body_parts_covered = HEAD diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 98c306244c3..c06f431cb49 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -354,6 +354,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "bucket" item_state = "bucket" + species_fit = list(INSECT_SHAPED) starting_materials = list(MAT_IRON = 200) w_type = RECYK_METAL w_class = W_CLASS_MEDIUM diff --git a/icons/mob/species/insectoid/head.dmi b/icons/mob/species/insectoid/head.dmi index 62ab86e7e1a..2682d28d473 100644 Binary files a/icons/mob/species/insectoid/head.dmi and b/icons/mob/species/insectoid/head.dmi differ