From fca36552937d3ffeec378a7b161dafee4012b0e6 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Wed, 23 Mar 2011 12:37:37 +0000 Subject: [PATCH] I fixed some stuff. Made the Hos A little more robust, and get handcuffs, energy gun, and a flash from the start along with sunglasses and an emergency gas mask. Made the warden slightly less robust than his boss, and get hand cuffs, and no FLASHBANGS. I hate those things! Their gun is now a taser at the start. All security members have a pair of latex gloves in their back packs for deal with with evidence, if they recall to put them on. Miner lockers have MESON SCANNERS! And.. Miner rank jumpsuits... Crates updated, new crate ARMOR. has helmets and armored vests (security access needed). Food Crates updated, hydroponics crate updated, and um... I did a few more minor job/ crate changes. Nothing stupid. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1244 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/mining.dm | 3 +- code/defines/obj/supplypacks.dm | 50 ++++++++++++++++----------------- code/game/jobs/jobprocs.dm | 26 ++++++++--------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index ef12ef25a62..5fe8f8cb1cb 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -430,13 +430,14 @@ proc/check_craftlathe_recipe(var/list/param_recipe) ..() sleep(2) new /obj/item/device/analyzer(src) - new /obj/item/clothing/under/color/white(src) + new /obj/item/clothing/under/rank/miner(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/shoes/black(src) new /obj/item/weapon/satchel(src) new /obj/item/device/flashlight/lantern(src) new /obj/item/weapon/shovel(src) new /obj/item/weapon/pickaxe(src) + new /obj/item/clothing/glasses/meson(src) /**********************Administration Shuttle**************************/ diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 97a4093118e..fd5fc112cb3 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -58,11 +58,11 @@ contains = list("/obj/item/weapon/reagent_containers/food/snacks/flour", "/obj/item/weapon/reagent_containers/food/snacks/flour", "/obj/item/weapon/reagent_containers/food/snacks/flour", - "/obj/item/weapon/reagent_containers/food/snacks/faggot", - "/obj/item/weapon/reagent_containers/food/snacks/faggot", - "/obj/item/weapon/reagent_containers/food/snacks/faggot", + "/obj/item/weapon/reagent_containers/food/snacks/flour", + "/obj/item/weapon/reagent_containers/food/drinks/milk", + "/obj/item/weapon/reagent_containers/food/drinks/milk", "/obj/item/kitchen/egg_box", - "/obj/item/weapon/storage/condimentbottles", + "/obj/item/weapon/reagent_containers/food/condiment/enzyme", "/obj/item/weapon/reagent_containers/food/snacks/banana", "/obj/item/weapon/reagent_containers/food/snacks/banana", "/obj/item/weapon/reagent_containers/food/snacks/banana") @@ -85,17 +85,7 @@ containertype = "/obj/crate/freezer" containername = "Meat crate" -/* DO NOT UNCOMMENT THIS, ORDERING THEM WILL BREAK THE SHUTTLE -/datum/supply_packs/monkey - name = "Monkey crate" - contains = list("/mob/living/carbon/monkey", - "/mob/living/carbon/monkey", - "/mob/living/carbon/monkey", - "/mob/living/carbon/monkey", - "/mob/living/carbon/monkey") - cost = 20 - containertype = "/obj/crate/freezer" - containername = "Monkey crate" */ +// Don't add living things to crates, that's bad, it will break the shuttle. /datum/supply_packs/engineering name = "Engineering crate" @@ -212,7 +202,7 @@ "/obj/item/weapon/storage/lightbox", "/obj/item/weapon/storage/lightbox", "/obj/item/weapon/storage/lightbox") - cost = 10 + cost = 5 containertype = "/obj/crate" containername = "Replacement lights" @@ -275,17 +265,30 @@ "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/handcuffs", "/obj/item/weapon/handcuffs") - cost = 30 + cost = 20 containertype = "/obj/crate/secure/gear" containername = "Riot crate" access = access_security +/datum/supply_packs/armor + name = "Armor crate" + contains = list("/obj/item/clothing/head/helmet", + "/obj/item/clothing/head/helmet", + "/obj/item/weapon/shield/riot", + "/obj/item/weapon/shield/riot", + "/obj/item/clothing/suit/armor/vest", + "/obj/item/clothing/suit/armor/vest",) + cost = 20 + containertype = "/obj/crate/secure/gear" + containername = "Armor crate" + access = access_security + /datum/supply_packs/evacuation name = "Emergency equipment" contains = list("/obj/machinery/bot/floorbot", "/obj/machinery/bot/floorbot", - "/obj/machinery/bot/floorbot", - "/obj/machinery/bot/floorbot", + "/obj/machinery/bot/medbot", + "/obj/machinery/bot/medbot", "/obj/item/weapon/tank/air", "/obj/item/weapon/tank/air", "/obj/item/weapon/tank/air", @@ -367,14 +370,10 @@ "/obj/item/weapon/plantbgone", "/obj/item/weapon/plantbgone", "/obj/item/weapon/plantbgone", -// "/obj/item/weapon/weedspray", -// "/obj/item/weapon/weedspray", -// "/obj/item/weapon/pestspray", -// "/obj/item/weapon/pestspray", "/obj/item/weapon/minihoe", "/obj/item/device/analyzer/plant_analyzer", - "/obj/item/clothing/gloves/latex", - "/obj/item/clothing/gloves/latex") // For handling nettles etc + "/obj/item/clothing/gloves/botanic_leather", + "/obj/item/clothing/suit/apron") // Updated with new things cost = 10 containertype = /obj/crate/hydroponics containername = "Hydroponics crate" @@ -384,6 +383,7 @@ name = "Seeds Crate" contains = list("/obj/item/seeds/chiliseed", "/obj/item/seeds/berryseed", + "/obj/item/seeds/corn", "/obj/item/seeds/eggplantseed", "/obj/item/seeds/tomatoseed", "/obj/item/seeds/soyaseed", diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 029aef54ae6..67ffea00bb4 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -422,13 +422,11 @@ src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/head/helmet(src), slot_head) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) + src.equip_if_possible(new /obj/item/clothing/gloves/white(src), slot_in_backpack) // src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) // src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack) -// src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack) -// src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack) -// src.equip_if_possible(new /obj/item/weapon/baton(src), slot_belt) -// src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store) + src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_l_store) if ("Warden") src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE @@ -441,8 +439,9 @@ src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves) src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask) - src.equip_if_possible(new /obj/item/weapon/gun/energy/general(src), slot_in_backpack) - src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack) +// src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack) src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store) if ("Scientist") @@ -451,21 +450,22 @@ src.equip_if_possible(new /obj/item/clothing/under/rank/scientist(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/mask/gas(src), slot_wear_mask) - src.equip_if_possible(new /obj/item/weapon/tank/air(src), slot_l_hand) + src.equip_if_possible(new /obj/item/weapon/tank/oxygen(src), slot_l_hand) - if ("Head of Security") + if ("Head of Security") //ready to come in game and kick ass - Microwave src.equip_if_possible(new /obj/item/device/radio/headset/heads/hos (src), slot_ears) src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/suit/armor/hos(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) + src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves) src.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(src), slot_head) + src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask) src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back) -// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) -// src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_belt) -// src.equip_if_possible(new /obj/item/weapon/gun/energy/laser_gun(src), slot_in_backpack) -// src.equip_if_possible(new /obj/item/weapon/storage/id_kit(src), slot_in_backpack) -// src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store) + src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) + src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/weapon/gun/energy/general(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store) if ("Head of Personnel")