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/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 240d631e..da559c25 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/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e630823d..dca63109 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1812,6 +1812,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/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() diff --git a/code/setup.dm b/code/setup.dm index ee89e314..13372233 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 0ea9293c..7a0ecffc 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ