diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 8759aef079f..a46f6bac8a5 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -43,7 +43,6 @@ /obj/item/clothing/head/culthood/alt icon_state = "cult_hoodalt" item_state = "cult_hoodalt" - loose = 5 // one size fits all /obj/item/clothing/suit/cultrobes/alt icon_state = "cultrobesalt" @@ -69,7 +68,6 @@ flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0 - loose = 6 // mostly one size fits all /obj/item/clothing/suit/magusred name = "magus robes" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 19ab6d2a366..29cef1026b6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -245,7 +245,6 @@ BLIND // can't see anything icon = 'icons/obj/clothing/hats.dmi' body_parts_covered = HEAD slot_flags = SLOT_HEAD - var/loose = 10 // probability (0..100) of coming off your head when you fall over or lay down var/blockTracking // Do we block AI tracking? var/flash_protect = 0 var/tint = 0 @@ -346,7 +345,6 @@ BLIND // can't see anything max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT siemens_coefficient = 0.9 species_restricted = list("exclude","Diona","Vox","Wryn") - loose = 0 // What kind of idiot designs a pressurized suit where the helmet can fall off? flash_protect = 2 /obj/item/clothing/suit/space diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 1cec0a26bb8..d1376bf3b8a 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -9,46 +9,39 @@ name = "ultra rare Pete's hat!" desc = "It smells faintly of plasma" icon_state = "petehat" - loose = 0 /obj/item/clothing/head/collectable/slime name = "collectable slime cap!" desc = "It just latches right in place!" icon_state = "slime" - loose = 0 /obj/item/clothing/head/collectable/xenom name = "collectable xenomorph helmet!" desc = "Hiss hiss hiss!" icon_state = "xenom" - loose = 35 // Zoinks! It was old man McGrief all along! /obj/item/clothing/head/collectable/chef name = "collectable chef's hat" desc = "A rare Chef's Hat meant for hat collectors!" icon_state = "chef" item_state = "chef" - loose = 45 // Mama mia! /obj/item/clothing/head/collectable/paper name = "collectable paper hat" desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." icon_state = "paper" - loose = 99 // fucking paper /obj/item/clothing/head/collectable/tophat name = "collectable top hat" desc = "A top hat worn by only the most prestigious hat collectors." icon_state = "tophat" item_state = "that" - loose = 70 // I say! /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" desc = "A Collectable Hat that'll make you look just like a real comdom!" icon_state = "captain" item_state = "caphat" - loose = 55 /obj/item/clothing/head/collectable/police name = "collectable police officer's hat" @@ -65,7 +58,6 @@ 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" - loose = 0 species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' @@ -76,68 +68,58 @@ desc = "Just like a real Brain Slug!" icon_state = "headslime" item_state = "headslime" - loose = 5 /obj/item/clothing/head/collectable/flatcap name = "collectable flat cap" desc = "A Collectible farmer's Flat Cap!" icon_state = "flat_cap" item_state = "detective" - loose = 5 /obj/item/clothing/head/collectable/pirate name = "collectable pirate hat" desc = "You'd make a great Dread Syndie Roberts!" icon_state = "pirate" item_state = "pirate" - loose = 55 // yar /obj/item/clothing/head/collectable/kitty name = "collectable kitty ears" desc = "The fur feels.....a bit too realistic." icon_state = "kitty" item_state = "kitty" - loose = 2 // meow /obj/item/clothing/head/collectable/rabbitears name = "collectable rabbit ears" desc = "Not as lucky as the feet!" icon_state = "bunny" item_state = "bunny" - loose = 4 // little bunny foo foo /obj/item/clothing/head/collectable/wizard name = "collectable wizard's hat" desc = "NOTE:Any magical powers gained from wearing this hat are purely coincidental." icon_state = "wizard" - loose = 4 /obj/item/clothing/head/collectable/hardhat name = "collectable hard hat" desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!" icon_state = "hardhat0_yellow" item_state = "hardhat0_yellow" - loose = 9 /obj/item/clothing/head/collectable/HoS name = "collectable HoS hat" desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!" icon_state = "hoscap" - loose = 29 /obj/item/clothing/head/collectable/thunderdome name = "collectable Thunderdome helmet" desc = "Go Red! I mean Green! I mean Red! No Green!" icon_state = "thunderdome" item_state = "thunderdome" - loose = 6 /obj/item/clothing/head/collectable/swat name = "collectable SWAT helmet" desc = "Now you can be in the Deathsquad too!" icon_state = "swat" item_state = "swat" - loose = 3 species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index ca24ab55d80..27afdc3ac0b 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -11,7 +11,6 @@ flags_inv = 0 action_button_name = "Toggle Helmet Light" siemens_coefficient = 0.9 - loose = 4 attack_self(mob/user) if(!isturf(user.loc)) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 3925c983f30..5a98a894fee 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -11,7 +11,6 @@ heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT siemens_coefficient = 0.7 - loose = 4 // generally well seated species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' @@ -126,7 +125,6 @@ item_state = "gladiator" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 1 - loose = 0 // full head, won't fall off obj/item/clothing/head/helmet/redtaghelm name = "red laser tag helmet" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 7eedccf7345..69e6cf767e5 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -7,7 +7,6 @@ item_state = "chef" desc = "The commander in chef's head wear." siemens_coefficient = 0.9 - loose = 35 // why-a do people always push-a me over //Captain /obj/item/clothing/head/caphat @@ -17,7 +16,6 @@ item_state = "caphat" siemens_coefficient = 0.9 armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) - loose = 43 // not the answer //Captain: no longer space-worthy /obj/item/clothing/head/caphat/parade @@ -32,7 +30,6 @@ desc = "The symbol of true bureaucratic micromanagement." siemens_coefficient = 0.9 armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) - loose = 43 // not the answer //Nanotrasen Representative /obj/item/clothing/head/ntrep @@ -48,7 +45,6 @@ icon_state = "chaplain_hood" flags = HEADCOVERSEYES | BLOCKHAIR siemens_coefficient = 0.9 - loose = 2 //Chaplain /obj/item/clothing/head/nun_hood @@ -57,7 +53,6 @@ icon_state = "nun_hood" flags = HEADCOVERSEYES | BLOCKHAIR siemens_coefficient = 0.9 - loose = 2 /obj/item/clothing/head/det_hat name = "hat" @@ -73,7 +68,6 @@ desc = "A beret, an artists favorite headwear." icon_state = "beret" siemens_coefficient = 0.9 - loose = 16 //Security /obj/item/clothing/head/HoS @@ -128,7 +122,6 @@ desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" flags = BLOCKHEADHAIR - loose = 13 /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." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a4209c48722..d3dcbcdd561 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -18,14 +18,12 @@ icon_state = "hairflowerp" item_state = "hairflowerp" item_state = "that" - loose = 0 // centcom /obj/item/clothing/head/powdered_wig name = "powdered wig" desc = "A powdered wig." icon_state = "pwig" item_state = "pwig" - loose = 90 // fucking whigs /obj/item/clothing/head/that name = "top-hat" @@ -33,19 +31,16 @@ icon_state = "tophat" item_state = "that" siemens_coefficient = 0.9 - loose = 70 /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" desc = "'I guess it's a redhead.'" - loose = 45 /obj/item/clothing/head/mailman name = "mailman's hat" icon_state = "mailman" desc = "'Right-on-time' mail service head wear." - loose = 65 /obj/item/clothing/head/plaguedoctorhat name = "plague doctor's hat" @@ -53,21 +48,18 @@ icon_state = "plaguedoctor" permeability_coefficient = 0.01 siemens_coefficient = 0.9 - loose = 30 /obj/item/clothing/head/hasturhood name = "hastur's hood" desc = "It's unspeakably stylish" icon_state = "hasturhood" flags = HEADCOVERSEYES | BLOCKHAIR - loose = 1 /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" siemens_coefficient = 0.9 - loose = 80 // allowing for awkward come-ons when he/she drops his/her hat and you get it for him/her. /obj/item/clothing/head/syndicatefake name = "black and red space-helmet replica" @@ -77,7 +69,6 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE siemens_coefficient = 2.0 - loose = 15 // not a very good replica /obj/item/clothing/head/cueball name = "cueball helmet" @@ -86,7 +77,6 @@ flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR item_state="cueball" flags_inv = 0 - loose = 0 /obj/item/clothing/head/that name = "sturdy top-hat" @@ -94,7 +84,6 @@ icon_state = "tophat" item_state = "that" flags_inv = 0 - loose = 70 /obj/item/clothing/head/greenbandana @@ -103,7 +92,6 @@ icon_state = "greenbandana" item_state = "greenbandana" flags_inv = 0 - loose = 1 /obj/item/clothing/head/cardborg name = "cardborg helmet" @@ -112,7 +100,6 @@ item_state = "cardborg_h" flags = HEADCOVERSEYES | HEADCOVERSMOUTH flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - loose = 20 /obj/item/clothing/head/justice name = "justice hat" @@ -120,7 +107,6 @@ icon_state = "justicered" item_state = "justicered" flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR - loose = 0 /obj/item/clothing/head/justice/blue icon_state = "justiceblue" @@ -142,7 +128,6 @@ name = "rabbit ears" desc = "Wearing these makes you looks useless, and only good for your sex appeal." icon_state = "bunny" - loose = 4 /obj/item/clothing/head/flatcap name = "flat cap" @@ -150,28 +135,24 @@ icon_state = "flat_cap" item_state = "detective" siemens_coefficient = 0.9 - loose = 1 /obj/item/clothing/head/pirate name = "pirate hat" desc = "Yarr." icon_state = "pirate" item_state = "pirate" - loose = 18 /obj/item/clothing/head/hgpiratecap name = "pirate hat" desc = "Yarr." icon_state = "hgpiratecap" item_state = "hgpiratecap" - loose = 36 /obj/item/clothing/head/bandana name = "pirate bandana" desc = "Yarr." icon_state = "bandana" item_state = "bandana" - loose = 0 //stylish bs12 hats @@ -222,7 +203,6 @@ item_state = "witch" flags = BLOCKHAIR siemens_coefficient = 2.0 - loose = 1 /obj/item/clothing/head/chicken name = "chicken suit head" @@ -251,7 +231,6 @@ item_state = "bearpelt" flags = BLOCKHAIR siemens_coefficient = 2.0 - loose = 0 // grrrr /obj/item/clothing/head/xenos name = "xenos helmet" @@ -281,7 +260,6 @@ /obj/item/clothing/head/fedora/brownfedora name = "brown fedora" icon_state = "bfedora" - loose = 35 /obj/item/clothing/head/stalhelm name = "Clown Stalhelm" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 7ca5f2ce444..430b1a54341 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -25,7 +25,6 @@ flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) action_button_name = "flip welding helmet" siemens_coefficient = 0.9 - loose = 4 species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' @@ -84,7 +83,6 @@ var/status = 0 var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage var/processing = 0 //I dont think this is used anywhere. - loose = 60 /obj/item/clothing/head/cakehat/process() if(!onfire) @@ -126,7 +124,6 @@ flags_inv = HIDEEARS cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - loose = 1 // too warm, your head doesn't want to leave /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) if(src.icon_state == "ushankadown") @@ -153,7 +150,6 @@ action_button_name = "Toggle Pumpkin Light" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) brightness_on = 2 //luminosity when on - loose = 80 /obj/item/clothing/head/hardhat/reindeer @@ -177,7 +173,6 @@ icon_state = "kitty" var/icon/mob siemens_coefficient = 1.5 - loose = 33 /obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user) if(!istype(user)) return diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 6764838430b..57f61d34bbc 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -8,7 +8,6 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 0.9 - loose = 7 /obj/item/clothing/suit/bio_suit name = "bio suit" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c56779b1b6a..45e44128ccb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -445,7 +445,6 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 0.9 - loose = 7 /obj/item/clothing/suit/jacket name = "bomber jacket" @@ -505,11 +504,10 @@ icon_state = "lordadmiral" item_state = "lordadmiral" allowed = list (/obj/item/weapon/gun) - + /obj/item/clothing/suit/fluff/noble_coat name = "noble coat" desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion." icon_state = "noble_coat" item_state = "noble_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - \ No newline at end of file diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index f1dde170997..9b30dafcf12 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -63,7 +63,6 @@ heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT siemens_coefficient = 0 - loose = 5 /obj/item/clothing/suit/bomb_suit @@ -105,7 +104,6 @@ desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100) - loose = 8 /obj/item/clothing/suit/radiation name = "Radiation suit" diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index beb206e4864..4a631cb7e10 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -6,7 +6,6 @@ permeability_coefficient = 0.01 armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 20, rad = 20) unacidable = 1 - loose = 0 // magic //Not given any special protective value since the magic robes are full-body protection --NEO siemens_coefficient = 0.8 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 09bca41ed3f..25d47867e2b 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -192,16 +192,6 @@ log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])") return - /* if(randn <= 45 && !lying) - if(head) - var/obj/item/clothing/head/H = head - if(!istype(H) || prob(H.loose)) - if(unEquip(H)) - if(prob(60)) - step_away(H,M) - visible_message("[M] has knocked [src]'s [H] off!", - "[M] knocked \the [H] clean off your head!") */ - var/talked = 0 // BubbleWrap if(randn <= 60) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 6f0f4f22626..4af3cf88499 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -54,38 +54,6 @@ emp_act return (..(P , def_zone)) -/mob/living/carbon/human/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon = null) - var/obj/item/organ/external/affected = get_organ(check_zone(def_zone)) - var/siemens_coeff = get_siemens_coefficient_organ(affected) - stun_amount *= siemens_coeff - agony_amount *= siemens_coeff - - switch (def_zone) - if("head") - agony_amount *= 1.50 - if("l_hand", "r_hand") - var/c_hand - if (def_zone == "l_hand") - c_hand = l_hand - else - c_hand = r_hand - - if(c_hand && (stun_amount || agony_amount > 10)) - msg_admin_attack("[src.name] ([src.ckey]) was disarmed by a stun effect") - - unEquip(c_hand) - if (affected.status & ORGAN_ROBOT) - custom_emote(1, "drops what they were holding, their [affected.name] malfunctioning!") - else - var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and") - custom_emote(1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [affected.name]!") - - if(used_weapon) - var/obj/item/W = used_weapon - affected.add_autopsy_data(W.name, agony_amount) // Add the weapon's name to the autopsy data - - ..(stun_amount, agony_amount, def_zone, used_weapon) - /mob/living/carbon/human/getarmor(var/def_zone, var/type) var/armorval = 0 var/organnum = 0 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 916b5b80195..08be473c4a7 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -65,21 +65,6 @@ apply_damage(P.damage, P.damage_type, def_zone, armor) return P.on_hit(src, armor, def_zone) -//Handles the effects of "stun" weapons -/mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null) - flash_pain() - - if (stun_amount) - Stun(stun_amount) - Weaken(stun_amount) - apply_effect(STUTTER, stun_amount) - apply_effect(EYE_BLUR, stun_amount) - - if (agony_amount) - apply_damage(agony_amount, HALLOSS, def_zone, 0, used_weapon) - apply_effect(STUTTER, agony_amount/10) - apply_effect(EYE_BLUR, agony_amount/10) - /mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null) return 0 //only carbon liveforms have this proc diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index c78721f8357..986f6b3c7e1 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -64,8 +64,6 @@ src << "\red Warning: Electromagnetic pulse detected." ..() -/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount) - return //immune /mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0) return