From fdabcc451f7814b2a5ab3ba3701c3949e3b05f7a Mon Sep 17 00:00:00 2001 From: Rygzengrho Date: Wed, 15 Dec 2010 10:38:17 +0000 Subject: [PATCH] Re-added missing "space assholes" verb. Reworked clothes slowdown code. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@624 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing.dm | 15 +++++++++- code/game/objects/items/clothing.dm | 2 ++ code/modules/admin/admin_verbs.dm | 8 +++++- code/modules/mob/living/carbon/human/human.dm | 28 ++----------------- code/setup.dm | 2 ++ 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 08562c8b4dc..c2d4243fe6f 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -14,6 +14,7 @@ var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) var/permeability_coefficient = 1 // for chemicals/diseases var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) + var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up // EARS @@ -424,13 +425,13 @@ /obj/item/clothing/shoes name = "shoes" icon = 'shoes.dmi' - var/chained = 0 body_parts_covered = FEET protective_temperature = 500 heat_transfer_coefficient = 0.10 permeability_coefficient = 0.50 + slowdown = SHOES_SLOWDOWN /obj/item/clothing/shoes/black name = "Black Shoes" @@ -446,10 +447,12 @@ /obj/item/clothing/shoes/orange name = "Orange Shoes" icon_state = "orange" + var/chained = 0 /obj/item/clothing/shoes/swat name = "SWAT shoes" icon_state = "swat" + slowdown = 0 /obj/item/clothing/shoes/white name = "White Shoes" @@ -467,6 +470,7 @@ icon_state = "galoshes" permeability_coefficient = 0.05 flags = NOSLIP + slowdown = 0 /obj/item/clothing/shoes/magboots desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." @@ -481,6 +485,7 @@ name = "clown shoes" icon_state = "clown" item_state = "clown_shoes" + slowdown = 0 // SUITS @@ -501,6 +506,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 heat_transfer_coefficient = 0.30 + slowdown = 1.3 /obj/item/clothing/suit/bio_suit/plaguedoctorsuit name = "Plague doctor suit" @@ -651,6 +657,7 @@ w_class = 4//bulky item gas_transfer_coefficient = 0.90 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + slowdown = 3 /obj/item/clothing/suit/armor/tdome body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS @@ -670,6 +677,7 @@ icon_state = "heavy" item_state = "heavy" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + slowdown = 2 // FIRE SUITS @@ -682,6 +690,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + slowdown = 1.3 protective_temperature = 4500 heat_transfer_coefficient = 0.01 @@ -695,6 +704,7 @@ //w_class = 4//bulky item protective_temperature = 10000 heat_transfer_coefficient = 0.01 + slowdown = 1.7 // SPACE SUITS @@ -711,18 +721,21 @@ protective_temperature = 1000 heat_transfer_coefficient = 0.02 allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) + slowdown = 3 /obj/item/clothing/suit/space/rig name = "rig suit" desc = "A special suit that protects against hazardous, low pressure environments." icon_state = "rig" item_state = "rig_suit" + slowdown = 2 /obj/item/clothing/suit/space/syndicate name = "red space suit" icon_state = "syndicate" item_state = "space_suit_syndicate" allowed = list(/obj/item/weapon/gun,/obj/item/weapon/ammo,/obj/item/weapon/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + slowdown = 1 /obj/item/clothing/suit/space/space_ninja name = "ninja suit" diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index 83ec2b98aa8..d0eaae8c448 100644 --- a/code/game/objects/items/clothing.dm +++ b/code/game/objects/items/clothing.dm @@ -36,6 +36,7 @@ DEATH COMMANDO GAS MASK /obj/item/clothing/shoes/orange/attack_self(mob/user as mob) if (src.chained) src.chained = null + src.slowdown = SHOES_SLOWDOWN new /obj/item/weapon/handcuffs( user.loc ) src.icon_state = "orange" return @@ -45,6 +46,7 @@ DEATH COMMANDO GAS MASK //H = null del(H) src.chained = 1 + src.slowdown = 15 src.icon_state = "orange1" return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d4c0dfe7934..13a2e649358 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -134,6 +134,7 @@ src.verbs += /client/proc/play_sound src.verbs += /client/proc/cuban_pete // -- Urist src.verbs += /client/proc/only_one // muskets + src.verbs += /client/proc/space_asshole // --Agouri :3 src.verbs += /proc/possess src.verbs += /proc/release @@ -253,6 +254,7 @@ src.verbs += /client/proc/play_sound src.verbs += /client/proc/cuban_pete // -- Urist src.verbs += /client/proc/only_one // muskets + src.verbs += /client/proc/space_asshole // --Agouri :3 src.verbs += /proc/possess src.verbs += /proc/release @@ -268,7 +270,6 @@ // Settings //src.verbs += /client/proc/colorooc // -- Urist - src.verbs += /client/proc/only_one // muskets src.verbs += /obj/admins/proc/adjump //toggle admin jumping src.verbs += /obj/admins/proc/adrev //toggle admin revives src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning @@ -373,6 +374,7 @@ //src.verbs += /client/proc/object_talk // -- TLE src.verbs += /client/proc/play_sound //src.verbs += /client/proc/cuban_pete // -- Urist + //src.verbs += /client/proc/space_asshole // --Agouri :3 src.verbs += /proc/possess src.verbs += /proc/release @@ -521,6 +523,7 @@ //src.verbs += /client/proc/object_talk // -- TLE src.verbs += /client/proc/play_sound //src.verbs += /client/proc/cuban_pete // -- Urist + //src.verbs += /client/proc/space_asshole // --Agouri :3 src.verbs += /proc/possess src.verbs += /proc/release @@ -659,6 +662,7 @@ //src.verbs += /client/proc/object_talk // -- TLE src.verbs += /client/proc/play_sound //src.verbs += /client/proc/cuban_pete // -- Urist + //src.verbs += /client/proc/space_asshole // --Agouri :3 //src.verbs += /proc/possess //src.verbs += /proc/release @@ -793,6 +797,7 @@ //src.verbs += /client/proc/object_talk // -- TLE //src.verbs += /client/proc/play_sound //src.verbs += /client/proc/cuban_pete // -- Urist + //src.verbs += /client/proc/space_asshole // --Agouri :3 //src.verbs += /proc/possess //src.verbs += /proc/release @@ -1060,6 +1065,7 @@ src.verbs -= /client/proc/object_talk // -- TLE src.verbs -= /client/proc/play_sound src.verbs -= /client/proc/cuban_pete // -- Urist + src.verbs -= /client/proc/space_asshole // --Agouri :3 src.verbs -= /proc/possess src.verbs -= /proc/release diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 19935cff534..37ad643d1b5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -128,32 +128,11 @@ if (hungry >= 70) tally += hungry/50 if(src.wear_suit) - switch(src.wear_suit.type) - if(/obj/item/clothing/suit/straight_jacket) - tally += 15 - if(/obj/item/clothing/suit/fire) // firesuits slow you down a bit - tally += 1.3 - if(/obj/item/clothing/suit/fire/heavy) // firesuits slow you down a bit - tally += 1.7 - if(/obj/item/clothing/suit/bio_suit) // biosuits slow you down a bit - tally += 1.3 - if(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit) // biosuits slow you down a bit - tally += 1.3 - if(/obj/item/clothing/suit/space) - if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space - tally += 3 - if(/obj/item/clothing/suit/space/rig) - if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space - tally += 2 - if(/obj/item/clothing/suit/space/syndicate) - if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space - tally += 1 + tally += src.wear_suit.slowdown if (istype(src.shoes, /obj/item/clothing/shoes)) - if (src.shoes.chained) - tally += 15 - else - tally += -1.0 + tally += src.shoes.slowdown + if(src.mutations & 32) tally += 1.5 if (src.bodytemperature < 283.222) @@ -669,7 +648,6 @@ else if (W == src.l_hand) src.l_hand = null - update_clothing() /mob/living/carbon/human/db_click(text, t1) diff --git a/code/setup.dm b/code/setup.dm index 5e401d1dfb9..b1e928ac466 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -79,6 +79,8 @@ #define FLOWFRAC 0.99 // fraction of gas transfered per process +#define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up + //FLAGS BITMASK #define ONBACK 1 // can be put in back slot