From 0894f612447e9680609c3363829dfe7b7fc421b0 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Tue, 30 Aug 2011 16:20:00 +0000 Subject: [PATCH] Ninja suit non longer has slow down (WHY IS NINJA SLOW?!). Void suit has a slight reduction in their slow down (making their speed on par with syndicate suits). Rig suits are now more resistant to fire, and as the captain's armor's slowdown number. Meson scanners had a -2 modifier to dark vision, I don't know if it was on purpose or not, but I reset the night vision to a zero modifier (-2 means you can't even see what's on your own tile in the dark, 0 modifier means no change from normal human night vision). Santa suit no longer has a slow down, suit storage can carry everything. Not a big deal, but it is handy in sandbox mode (which I'm still working on, I'm just not good at making it less shit of a mode). git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2075 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/clothing/glasses/glasses.dm | 16 +--------------- .../modules/clothing/spacesuits/miscellaneous.dm | 4 ++-- code/modules/clothing/spacesuits/ninja.dm | 3 ++- code/modules/clothing/spacesuits/rig.dm | 3 ++- code/modules/clothing/spacesuits/void.dm | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 53450ae3a64..0f052d38839 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,5 +1,3 @@ - - /obj/item/clothing/glasses/blindfold name = "blindfold" desc = "Makes you like...blind." @@ -7,7 +5,6 @@ item_state = "blindfold" vision_flags = BLIND - /obj/item/clothing/glasses/meson name = "Optical Meson Scanner" desc = "Used for seeing walls, floors, and stuff through anything." @@ -15,8 +12,6 @@ item_state = "glasses" origin_tech = "magnets=2;engineering=2" vision_flags = SEE_TURFS - darkness_view = -2 - /obj/item/clothing/glasses/night name = "Night Vision Goggles" @@ -27,7 +22,6 @@ vision_flags = SEE_TURFS darkness_view = 3 - /obj/item/clothing/glasses/material name = "Optical Material Scanner" desc = "Very confusing glasses." @@ -36,21 +30,18 @@ origin_tech = "magnets=3;engineering=3" vision_flags = SEE_OBJS - /obj/item/clothing/glasses/regular name = "Prescription Glasses" desc = "Made by Nerd. Co." icon_state = "glasses" item_state = "glasses" - /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/sunglasses desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." name = "Sunglasses" @@ -70,7 +61,6 @@ src.hud = new/obj/item/clothing/glasses/hud/security(src) return - /obj/item/clothing/glasses/thermal name = "Optical Thermal Scanner" desc = "Thermals in the shape of glasses." @@ -86,12 +76,8 @@ icon_state = "thermoncle" flags = null //doesn't protect eyes because it's a monocle, duh - /obj/item/clothing/glasses/thermal/eyepatch name = "Optical Thermal Eyepatch" desc = "An eyepatch with built-in thermal optics" icon_state = "eyepatch" - item_state = "eyepatch" - - - + item_state = "eyepatch" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e503c129501..6afeec84271 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -38,9 +38,9 @@ desc = "Festive!" icon_state = "santa" item_state = "santa" - slowdown = 1 + slowdown = 0 flags = FPRINT | TABLEPASS | ONESIZEFITSALL | SUITSPACE - + allowed = list(/obj/item) //for stuffing exta special presents /obj/item/clothing/head/helmet/space/pirate diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 863d80576dc..f4fc4c1be02 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -16,7 +16,8 @@ item_state = "s-ninja_suit" allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell) radiation_protection = 0.75 - slowdown = 1 + protective_temperature = 5000 + slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30) var diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 0692707914b..96d24bf8d12 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -16,7 +16,8 @@ icon_state = "rig-engineering" item_state = "rig_suit" radiation_protection = 0.50 - slowdown = 2 + protective_temperature = 5000 //For not dieing near a fire, but still not being great in a full inferno + slowdown = 1.5 armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner) diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index e3309c2a642..261af899ebe 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -11,4 +11,4 @@ icon_state = "void" item_state = "void" desc = "A high tech, NASA Centcom branch designed, dark red Space suit. Used for AI satellite maintenance." - slowdown = 1.5 + slowdown = 1