From ef4af19765888bd8a7f449bba8a065774bc2d013 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Thu, 31 Mar 2011 11:19:16 +0000 Subject: [PATCH] God... I went though a lot of cloths. In Gimmick, Santa suit now is pretty quick (but it can't spawn in game so fat chance of using it). Typo fix, description changes. In head, A few descriptions changes. Jumpsuits, Chemists and the CMO have their OWN jump suits now. So no one can confuse the chemist in chemistry with a geneticist. Added a space Jumpsuit to the code, it can only be spawned by admins or people in sand box. So you can jump out an air locks with it now (default sprite is a black jumpsuit). Fixed the roboticists jump suit so the head transfer coefficient is lower (as some One set it to the same level as a lab coat for some insane reason, lucky we don't have more frozen people in robotics). Miner jump suits are a fraction better against heat transfer than other jump suits, but just slightly. In Suits Tacticool NASA Voidsuit, which is just like a Red space suit but can only hold energy guns, are slower (slightly) and are bulky (so you can't hide them in back packs). Also, a few description changes. Perhaps now we can add these to the AI satellite teleporter room? Maybe? Job Procs Chemist and CMO start with above stated jumpsuits for their job ranks. Flamethrower Gives 1 weapons and 1 plasma research. This was something the creator of the R&D had not gotten around to doing (when questioned about it a while back, he wanted it to give minor tech fields in both, but got busy), so I just want to lighten the load. Mining Tweaked the tech origin of plasma cutters so it will contribute to plasma research now. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1323 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/mining.dm | 2 +- code/defines/obj/clothing/gimmick.dm | 5 ++- code/defines/obj/clothing/head.dm | 21 ++++++---- code/defines/obj/clothing/jumpsuit.dm | 39 +++++++++++++++---- code/defines/obj/clothing/suit.dm | 17 ++++++-- code/game/jobs/jobprocs.dm | 4 +- .../objects/items/weapons/flamethrower.dm | 2 + 7 files changed, 67 insertions(+), 23 deletions(-) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 75e4f93c8ab..feeaed8d7c1 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2561,7 +2561,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( icon_state = "plasmacutter" icon_state = "gun" digspeed = 0 - origin_tech = "materials=6, plasma=3" + origin_tech = "materials=6; plasmatech=3" desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." /obj/item/weapon/pickaxe/radius // For the side project to make radius cutting devices diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index 35a1b99d5f1..d9e208704db 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/rabbitears name = "Rabbit Ears" - desc = "Wearing thes makes you looks useless, and only good for your sex appeal." + desc = "Wearing these makes you looks useless, and only good for your sex appeal." icon_state = "bunny" flags = FPRINT | TABLEPASS | HEADSPACE @@ -12,7 +12,7 @@ /obj/item/clothing/under/blackskirt name = "Black skirt" - desc = "A black skirt" + desc = "A black skirt, very fancy!" icon_state = "blackskirt" color = "blackskirt" @@ -30,6 +30,7 @@ desc = "Festive!" icon_state = "santa" item_state = "santa" + slowdown = 1 flags = FPRINT | TABLEPASS | ONESIZEFITSALL diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 6466ebad734..be14323b3b0 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -9,6 +9,7 @@ /obj/item/clothing/head/radiation name = "Radiation Hood" icon_state = "rad" + desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" radiation_protection = 0.35 flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH @@ -24,6 +25,7 @@ /obj/item/clothing/head/bio_hood name = "bio hood" icon_state = "bio" + desc = "Keeps the germs from flying on your face." permeability_coefficient = 0.01 flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH @@ -44,7 +46,7 @@ /obj/item/clothing/head/cakehat name = "cakehat" - desc = "It is a cakehat" + desc = "It is a cakehat!" icon_state = "cake0" var/onfire = 0.0 var/status = 0 @@ -54,30 +56,32 @@ /obj/item/clothing/head/caphat name = "Captain's hat" icon_state = "captain" + desc = "It is good being the king." flags = FPRINT|TABLEPASS|SUITSPACE item_state = "caphat" /obj/item/clothing/head/centhat name = "Cent. Comm. hat" icon_state = "centcom" + desc = "It is even better to be the emperor." flags = FPRINT|TABLEPASS|SUITSPACE item_state = "centhat" /obj/item/clothing/head/det_hat name = "hat" - desc = "Someone who wears this will look very smart" + desc = "Someone who wears this will look very smart." icon_state = "detective" allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) /obj/item/clothing/head/powdered_wig name = "powdered wig" - desc = "A powdered wig" + desc = "A powdered wig." icon_state = "pwig" item_state = "pwig" /obj/item/clothing/head/that name = "Top hat" - desc = "An amish looking hat" + desc = "An amish looking hat." icon_state = "tophat" item_state = "that" flags = FPRINT|TABLEPASS|HEADSPACE @@ -99,13 +103,14 @@ /obj/item/clothing/head/wizard/marisa name = "Witch Hat" - desc = "Strange-looking hat-wear that most certainly belongs to a real magic user." + desc = "Strange-looking hat-wear, makes you want to cast fireballs." icon_state = "marisa" /obj/item/clothing/head/chefhat name = "Chef's hat" icon_state = "chef" item_state = "chef" + desc = "The commander in chef's head wear." flags = FPRINT | TABLEPASS | HEADSPACE /obj/item/clothing/head/plaguedoctorhat @@ -116,7 +121,7 @@ /obj/item/clothing/head/beret name = "beret" - desc = "A mime's beret" + desc = "A beret, a mime's favorite headwear." icon_state = "beret" flags = FPRINT | TABLEPASS | HEADSPACE @@ -135,13 +140,14 @@ /obj/item/clothing/head/helmet/space name = "space helmet" icon_state = "space" + desc = "A special helmet designed for work in a hazardous, low-pressure environment." flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | HEADCOVERSMOUTH see_face = 0.0 item_state = "space" permeability_coefficient = 0.01 /obj/item/clothing/head/helmet/space/rig - desc = "A special helmet designed for work in a hazardous, low-pressure environment." + desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding" name = "rig helmet" icon_state = "rig" item_state = "rig_helm" @@ -188,6 +194,7 @@ /obj/item/clothing/head/helmet/HoS name = "HoS helmet" icon_state = "hoscap" + desc = "A hat that shows the security grunts who's in charge!" flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES /obj/item/clothing/head/helmet/that diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 11ecb9feee0..4b590015fb4 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -140,6 +140,14 @@ color = "geneticswhite" permeability_coefficient = 0.50 +/obj/item/clothing/under/rank/chemist + desc = "Made of a special fiber that gives special protection against biohazards. Has a chemist rank stripe on it." + name = "Chemist Jumpsuit" + icon_state = "genetics" + item_state = "w_suit" + color = "geneticswhite" + permeability_coefficient = 0.50 + /obj/item/clothing/under/rank/head_of_personnel desc = "It has a Head of Personnel rank stripe on it." name = "Head of Personnel Jumpsuit" @@ -162,12 +170,11 @@ color = "centcom" /obj/item/clothing/under/rank/miner - desc = "A snappy jumpsuit with a sturdy set of overalls. It is very dirty." + desc = "A snappy jumpsuit with a sturdy set of overalls. It is very dirty. It has a shaft miner rank stripe on it." name = "Shaft Miner Jumpsuit" icon_state = "miner" item_state = "miner" color = "miner" - permeability_coefficient = 0.50 /obj/item/clothing/under/rank/roboticist desc = "A slimming black with reinforced seams. Great for industrial work." @@ -175,8 +182,6 @@ icon_state = "robotics" item_state = "robotics" color = "robotics" - permeability_coefficient = 0.25 //This is the protection a lab coat provided previously. - heat_transfer_coefficient = 0.75 /obj/item/clothing/under/rank/head_of_security desc = "It has a Head of Security rank stripe on it." @@ -200,7 +205,7 @@ color = "director" /obj/item/clothing/under/rank/janitor - desc = "Official clothing of the station's poopscooper." + desc = "Official clothing of the station's poopscooper. It has a janitor rank stripe on it" name = "Janitor's Jumpsuit" icon_state = "janitor" color = "janitor" @@ -214,13 +219,21 @@ permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical - desc = "Made of a special fiber that gives special protection against biohazards. Has a medical rank stripe on it." + desc = "Made of a special fiber that gives special protection against biohazards. It has a Chief Medical Officer rank stripe on it." name = "Medical Doctor's Jumpsuit" icon_state = "medical" item_state = "w_suit" color = "medical" permeability_coefficient = 0.50 +/obj/item/clothing/under/rank/chief_medical_officer + desc = "Made of a special fiber that gives special protection against biohazards. Has a medical rank stripe on it." + name = "Chief Medical Officer's Jumpsuit" + icon_state = "medical" + item_state = "w_suit" + color = "medical" + permeability_coefficient = 0.50 + /obj/item/clothing/under/rank/hydroponics desc = "Made of a special fiber that gives special protection against biohazards. Has a Hydroponics rank stripe on it." name = "Hydroponics Jumpsuit" @@ -344,4 +357,16 @@ /obj/item/clothing/under/shorts/grey icon_state = "greyshorts" - color = "greyshorts" \ No newline at end of file + color = "greyshorts" + +/obj/item/clothing/under/space + name = "NASA Jumpsuit" + icon_state = "black" + item_state = "bl_suit" + desc = "Has a NASA logo on it, looks space worthy." + gas_transfer_coefficient = 0.01 + w_class = 4//bulky item + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + permeability_coefficient = 0.02 + protective_temperature = 1000 + heat_transfer_coefficient = 0.02 \ No newline at end of file diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index d2c97acbe7d..c3f3ff16b5a 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -261,7 +261,7 @@ protective_temperature = 4500 heat_transfer_coefficient = 0.01 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher) /obj/item/clothing/suit/fire/firefighter icon_state = "firesuit" @@ -269,7 +269,7 @@ /obj/item/clothing/suit/radiation name = "Radiation suit" - desc = "A suit that protects against radiation." + desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation." icon_state = "rad" item_state = "rad_suit" //w_class = 4//bulky item @@ -298,7 +298,7 @@ /obj/item/clothing/suit/space name = "space suit" - desc = "A suit that protects against low pressure environments." + desc = "A suit that protects against low pressure environments. Has a big 13 on the back." icon_state = "space" gas_transfer_coefficient = 0.01 item_state = "s_suit" @@ -314,7 +314,7 @@ /obj/item/clothing/suit/space/rig name = "rig suit" - desc = "A special suit that protects against hazardous, low pressure environments." + desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." icon_state = "rig" item_state = "rig_suit" slowdown = 2 @@ -324,10 +324,19 @@ name = "red space suit" icon_state = "syndicate" item_state = "space_suit_syndicate" + desc = "Has a tag on it: Totally not property of of a hostile corporation!" w_class = 3 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/nasa + name = "Tacticool NASA Voidsuit" + icon_state = "s-ninja" + item_state = "s-ninja_suit" + desc = "A tacticool, NASA Centcom branch designed, black Space suit. Used for AI satilite maintenance." + allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/tank/emergency_oxygen) + slowdown = 1.3 + /obj/item/clothing/suit/space/space_ninja name = "ninja suit" desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider-Clan assassins." diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index a1289b13dc1..e09bcb8e758 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -321,7 +321,7 @@ if ("Chemist") src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE src.equip_if_possible(new /obj/item/device/pda/toxins(src), slot_belt) - src.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(src), slot_w_uniform) + src.equip_if_possible(new /obj/item/clothing/under/rank/chemist(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit) @@ -576,7 +576,7 @@ src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt) src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) - src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform) + src.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(src), slot_wear_suit) src.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_l_hand) src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index b258efc1364..5f6a08d8c68 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -25,6 +25,8 @@ GETLINEEEEEEEEEEEEEEEEEEEEE var/obj/item/device/igniter/part3 = null var/obj/item/weapon/tank/plasma/part4 = null m_amt = 500 + origin_tech = "combat=1; plasmatech=1" + // PantsNote: Dumping this shit in here until I'm sure it works.