From 68f9b08db321518286c363c70192ebd0ae780216 Mon Sep 17 00:00:00 2001 From: Meowykins Date: Sun, 31 Aug 2014 14:13:22 -0500 Subject: [PATCH 1/2] Ch-ch-changes. Time to face the strange. Autolathe -New items(sunglasses, lantern, bone setter, pill bottle, new empty oxygen tank) Communications -Head access only. Captain access req. removed. Redundant if Heads have access. Edits to Items -All items added to the autolathe now have matter amounts. New Oxygen Tank -Special to the autolathe. Spawns without air. --- code/datums/supplypacks.dm | 13 +++++++++++-- code/game/machinery/autolathe.dm | 13 +++++++++---- code/game/machinery/computer/communications.dm | 2 +- .../game/objects/items/weapons/storage/firstaid.dm | 2 ++ code/game/objects/items/weapons/surgery_tools.dm | 1 + .../game/objects/items/weapons/tanks/tank_types.dm | 14 +++++++++++++- code/modules/clothing/glasses/glasses.dm | 2 ++ code/modules/mining/mine_items.dm | 2 ++ .../food/drinks/drinkingglass.dm | 1 + 9 files changed, 42 insertions(+), 8 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 039c0827..7c72634a 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1184,7 +1184,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containertype = /obj/structure/closet/crate/secure containername = "medical hardsuit kit" access = access_medical - group = "Medical" + group = "Medical / Science" /datum/supply_packs/condiments name = "Condiment Supply" @@ -1203,4 +1203,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "condiment kit" - group = "Supply" \ No newline at end of file + group = "Supply" + +/datum/supply_packs/pillboxes + name = "Chemistry Crate" + contains = list(/obj/item/weapon/storage/box/pillbottles) + cost = 20 + containertype = /obj/structure/closet/crate/secure + containername = "Pill Bottle Kit" + access = access_medical + group = "Medical / Science" diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index e9fbe390..d281ec09 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -5,6 +5,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/reagent_containers/glass/bucket(), \ new /obj/item/weapon/crowbar(), \ new /obj/item/device/flashlight(), \ + new /obj/item/device/flashlight/lantern(), \ new /obj/item/weapon/extinguisher(), \ new /obj/item/device/multitool(), \ new /obj/item/device/t_scanner(), \ @@ -12,6 +13,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/screwdriver(), \ new /obj/item/weapon/wirecutters(), \ new /obj/item/weapon/wrench(), \ + new /obj/item/clothing/glasses/sunglasses(), \ new /obj/item/clothing/head/welding(), \ new /obj/item/weapon/stock_parts/console_screen(), \ new /obj/item/weapon/airlock_electronics(), \ @@ -26,10 +28,11 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/kitchenknife(), \ new /obj/item/weapon/scalpel(), \ new /obj/item/weapon/circular_saw(), \ - new /obj/item/weapon/surgicaldrill(),\ - new /obj/item/weapon/retractor(),\ - new /obj/item/weapon/cautery(),\ - new /obj/item/weapon/hemostat(),\ + new /obj/item/weapon/surgicaldrill(), \ + new /obj/item/weapon/retractor(), \ + new /obj/item/weapon/cautery(), \ + new /obj/item/weapon/hemostat(), \ + new /obj/item/weapon/bonesetter(), \ new /obj/item/weapon/reagent_containers/glass/beaker(), \ new /obj/item/weapon/reagent_containers/glass/beaker/large(), \ new /obj/item/weapon/reagent_containers/glass/beaker/vial(), \ @@ -49,6 +52,8 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/light/bulb(), \ new /obj/item/ashtray/glass(), \ new /obj/item/weapon/camera_assembly(), \ + new /obj/item/weapon/tank/autolathe(), \ + new /obj/item/weapon/storage/pill_bottle(), \ ) var/global/list/autolathe_recipes_hidden = list( \ diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index c5f7974b..157e9622 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -76,7 +76,7 @@ var/obj/item/device/pda/pda = I I = pda.id if (I && istype(I)) - if(access_captain in I.access || access_heads in I.access) //Let heads change the alert level. + if(access_heads in I.access) //Let heads change the alert level. var/old_level = security_level if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index e2dce270..773ed2e7 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -123,6 +123,8 @@ allow_quick_gather = 1 use_to_pickup = 1 storage_slots = 14 + m_amt = 100 + g_amt = 700 use_sound = null /obj/item/weapon/storage/pill_bottle/verb/rename() diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 245ebea7..fa50951b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -850,6 +850,7 @@ LOOK FOR SURGERY.DM*/ force = 8.0 throwforce = 9.0 throw_speed = 3 + m_amt = 1000 throw_range = 5 w_class = 2.0 attack_verb = list("attacked", "hit", "bludgeoned") diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 947d61f6..dbaf6627 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -186,4 +186,16 @@ ..() if(air_contents.nitrogen < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - //playsound(usr, 'sound/effects/alert.ogg', 50, 1) \ No newline at end of file + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) + +/obj/item/weapon/tank/autolathe + name = "Emergency Tank" + desc = "Used for emergencies. Use wisely." + icon_state = "emergency" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT + w_class = 2.0 + force = 4.0 + m_amt = 1000 + distribute_pressure = ONE_ATMOSPHERE*O2STANDARD + volume = 2 \ No newline at end of file diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 566ee166..59fb4894 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -106,6 +106,8 @@ icon_state = "sun" item_state = "sunglasses" darkness_view = -1 + g_amt = 1000 + m_amt = 500 /obj/item/clothing/glasses/welding name = "welding goggles" diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 77cbe616..2c777c8d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -170,6 +170,8 @@ proc/move_mining_shuttle() name = "lantern" icon_state = "lantern" desc = "A mining lantern." + m_amt = 1000 + g_amt = 500 brightness_on = 6 // luminosity when on /*****************************Pickaxe********************************/ diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index fc4acdee..0b10f15f 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -5,6 +5,7 @@ desc = "Your standard drinking glass." icon_state = "glass_empty" amount_per_transfer_from_this = 10 + g_amt = 500 volume = 50 on_reagent_change() From 3f4016677790b0530673a9c60f194e5b842921ff Mon Sep 17 00:00:00 2001 From: Meowykins Date: Tue, 2 Sep 2014 13:50:23 -0500 Subject: [PATCH 2/2] AntagHUD -- Vampires Sprites made for an AntagHUD for Vamps, so ghosts can see who's antag during Vampire rounds. --- code/datums/mind.dm | 1 + code/modules/mob/living/carbon/human/life.dm | 2 ++ code/setup.dm | 2 +- icons/mob/hud.dmi | Bin 2955 -> 3001 bytes 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index ee7f1b34..1c12d54d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -780,6 +780,7 @@ datum/mind domutcheck(current, null) else if (href_list["vampire"]) + current.hud_updateflag |= (1 << SPECIALROLE_HUD) switch(href_list["vampire"]) if("clear") if(src in ticker.mode.vampires) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c1146fe5..cade194d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1808,6 +1808,8 @@ holder.icon_state = "huddeathsquad" if("Ninja") holder.icon_state = "hudninja" + if("Vampire") + holder.icon_state = "hudvampire" hud_list[SPECIALROLE_HUD] = holder hud_updateflag = 0 diff --git a/code/setup.dm b/code/setup.dm index c0259f40..7464761d 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -697,7 +697,7 @@ var/list/be_special_flags = list( #define IMPLOYAL_HUD 5 // loyality implant #define IMPCHEM_HUD 6 // chemical implant #define IMPTRACK_HUD 7 // tracking implant -#define SPECIALROLE_HUD 8 // AntagHUD image +#define SPECIALROLE_HUD 9 // AntagHUD image #define STATUS_HUD_OOC 9 // STATUS_HUD without virus db check for someone being ill. //Pulse levels, very simplified diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 0ea9293c2acc6f5a8b959bed768324f0488f2767..7a0ecffcad7172a9e012b4e7bd01a99346c709ae 100644 GIT binary patch delta 2672 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 VeKQiQx7zW0VSLd-zf9LH=07p<<9`4E