diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm index 761e6af114d..adb53301b61 100644 --- a/code/game/objects/items/devices/lighting/flare.dm +++ b/code/game/objects/items/devices/lighting/flare.dm @@ -14,6 +14,7 @@ var/produce_heat = 1500 light_wedge = LIGHT_OMNI activation_sound = 'sound/items/flare.ogg' + drop_sound = 'sound/items/drop/gloves.ogg' /obj/item/device/flashlight/flare/New() fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index b5de521372b..376d6b32403 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -100,7 +100,7 @@ name = "penlight" desc = "A pen-sized light, used by medical staff." icon_state = "penlight" - item_state = "" + item_state = "pen" drop_sound = 'sound/items/drop/accessory.ogg' flags = CONDUCT slot_flags = SLOT_EARS diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 55ef5b22078..77825ad333a 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -11,7 +11,7 @@ BREATH ANALYZER name = "health analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." icon_state = "health" - item_state = "analyzer" + item_state = "healthanalyzer" flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 @@ -74,12 +74,12 @@ BREATH ANALYZER return var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss()))) - + var/OX = 0 var/TX = 0 var/BU = 0 var/BR = 0 - + if (adv == TRUE) OX = M.getOxyLoss() TX = M.getToxLoss() @@ -90,7 +90,7 @@ BREATH ANALYZER TX = calcDamage(M.getToxLoss()) BU = calcDamage(M.getFireLoss()) BR = calcDamage(M.getBruteLoss()) - + if(M.status_flags & FAKEDEATH) if (adv == TRUE) OX = fake_oxy @@ -164,12 +164,12 @@ BREATH ANALYZER var/datum/record/virus/V = SSrecords.find_record("id", "[ID]", RECORD_VIRUS) if(istype(V)) user.show_message("Warning: Pathogen [V.name] detected in subject's blood. Known antigen : [V.antigen]") - + if(M.nutrition / M.max_nutrition <= CREW_NUTRITION_VERYHUNGRY) user.show_message("Subject malnourished. Food intake recommended.") if(M.hydration / M.max_hydration <= CREW_HYDRATION_VERYTHIRSTY) user.show_message("Subject dehydrated. Fluid intake recommended.") - + if (M.getCloneLoss()) user.show_message("Subject appears to have been imperfectly cloned.") for(var/datum/disease/D in M.viruses) @@ -226,7 +226,7 @@ BREATH ANALYZER else user.show_message("Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]") user.show_message("Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") - + /obj/item/device/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" set category = "Object" @@ -237,19 +237,19 @@ BREATH ANALYZER to_chat(usr, "The scanner now shows specific limb damage.") else to_chat(usr, "The scanner no longer shows limb damage.") - + /obj/item/device/healthanalyzer/adv name = "advanced health analyzer" desc = "An advanced hand-held body scanner able to accurately distinguish vital signs of the subject. Now in gold!" icon_state = "advhealth" matter = list(DEFAULT_WALL_MATERIAL = 250) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - + /obj/item/device/healthanalyzer/adv/attack(mob/living/M as mob, mob/living/user as mob) health_scan_mob(M, user, TRUE) src.add_fingerprint(user) return - + /obj/item/device/healthanalyzer/adv/attack_self(mob/user) health_scan_mob(user, user, TRUE) src.add_fingerprint(user) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index e246e649e7a..e9c07680454 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -27,6 +27,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list( max_amount = 60 attack_verb = list("hit", "bludgeoned", "whacked") lock_picking_level = 3 + drop_sound = 'sound/items/drop/sword.ogg' /obj/item/stack/rods/cyborg name = "metal rod synthesizer" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 9373df9b879..f3a0781f787 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -45,7 +45,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM origin_tech = list(TECH_MATERIAL = 1) slot_flags = SLOT_EARS attack_verb = list("burnt", "singed") - drop_sound = null + drop_sound = 'sound/items/drop/food.ogg' /obj/item/flame/match/process() if(isliving(loc)) @@ -100,7 +100,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/ignitermes = "USER lights NAME with FLAME" var/initial_volume = 0 var/burn_rate = 0 - drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg' + drop_sound = 'sound/items/drop/food.ogg' /obj/item/clothing/mask/smokable/Initialize() . = ..() @@ -337,6 +337,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM zippomes = "With a flick of their wrist, USER lights their NAME with their FLAME." weldermes = "USER insults NAME by lighting it with FLAME." ignitermes = "USER fiddles with FLAME, and manages to light their NAME with the power of science." + drop_sound = 'sound/items/drop/gloves.ogg' /obj/item/clothing/mask/smokable/cigarette/cigar/Initialize() . = ..() @@ -383,6 +384,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM w_class = 1 slot_flags = SLOT_EARS throwforce = 1 + drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg' /obj/item/cigbutt/Initialize() . = ..() @@ -418,6 +420,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM zippomes = "With much care, USER lights their NAME with their FLAME." weldermes = "USER recklessly lights NAME with FLAME." ignitermes = "USER fiddles with FLAME, and manages to light their NAME with the power of science." + drop_sound = 'sound/items/drop/accessory.ogg' /obj/item/clothing/mask/smokable/pipe/Initialize() . = ..() @@ -523,6 +526,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM 'sound/items/cigs_lighters/cheap_on3.ogg', ) var/deactivation_sound = 'sound/items/cigs_lighters/cheap_off.ogg' + drop_sound = 'sound/items/drop/card.ogg' /obj/item/flame/lighter/zippo name = "\improper Zippo lighter" @@ -531,6 +535,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "zippo" activation_sound = 'sound/items/cigs_lighters/zippo_on.ogg' deactivation_sound = 'sound/items/cigs_lighters/zippo_off.ogg' + drop_sound = 'sound/items/drop/accessory.ogg' /obj/item/flame/lighter/random New() diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index a32148ae916..b7e93810ec3 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -52,6 +52,7 @@ var/obj/item/clothing/mask/smokable/cigarette/cig = W if (cig.lit == 1) src.visible_message("[user] crushes [cig] in \the [src], putting it out.") + playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) STOP_PROCESSING(SSprocessing, cig) var/obj/item/butt = new cig.type_butt(src) cig.transfer_fingerprints_to(butt) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 3722b5b1925..7f8d6bfff54 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -5,6 +5,7 @@ * Utensils */ /obj/item/material/kitchen/utensil + drop_sound = 'sound/items/drop/knife.ogg' w_class = 1 thrown_force_divisor = 1 origin_tech = list(TECH_MATERIAL = 1) diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 5994b56d366..ade97435d1e 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -30,6 +30,7 @@ action_button_name = "Wield two-handed weapon" icon = 'icons/obj/weapons.dmi' hitsound = "swing_hit" + drop_sound = 'sound/items/drop/sword.ogg' /obj/item/material/twohanded/proc/unwield() wielded = 0 @@ -344,6 +345,7 @@ var/cutting = 0 //Ignore var/powered = 0 //Ignore + drop_sound = 'sound/items/drop/metalshield.ogg' /obj/item/material/twohanded/chainsaw/Initialize() . = ..() @@ -535,6 +537,7 @@ reach = 2 applies_material_colour = 0 can_embed = 0 + drop_sound = 'sound/items/drop/woodweapon.ogg' /obj/item/material/twohanded/pike/halberd icon_state = "halberd0" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 49d3cb59d2e..ab4d7a2c56b 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -162,7 +162,7 @@ slot_flags = SLOT_BELT storage_slots = 6 var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette - can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter) + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/cigbutt) icon_type = "cigarette" /obj/item/storage/fancy/cigarettes/Initialize() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 5e834a084b6..aca1fd821da 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -7,9 +7,15 @@ LINEN BINS /obj/item/bedsheet name = "bedsheet" desc = "A surprisingly soft linen bedsheet." + description_info = "Click to roll and unroll. Alt-click to fold and unfold. Drag and drop to pick up." + description_fluff = "It seems like you can equip it in your backpack slot..." icon = 'icons/obj/bedsheets.dmi' - icon_state = "bedsheet" - item_state = "bedsheet" + icon_state = "sheetwhite" + item_state = "sheetwhite" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_bedsheet.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_bedsheet.dmi', + ) slot_flags = SLOT_BACK layer = 4.0 throwforce = 1 @@ -189,6 +195,11 @@ LINEN BINS qdel(src) return ..() + +/obj/item/bedsheet/grey + icon_state = "sheetgrey" + item_state = "sheetgrey" + /obj/item/bedsheet/red icon_state = "sheetred" item_state = "sheetred" @@ -316,6 +327,47 @@ LINEN BINS item_state = "sheetcostume" slot_flags = SLOT_OCLOTHING +/obj/item/bedsheet/random + name = "random bedsheet" + icon_state = "sheetrandom" + item_state = "sheetrainbow" + desc = "If you're reading this description ingame, something has gone wrong! Honk!" + +/obj/item/bedsheet/random/Initialize() + ..() + var/type = pick(typesof(/obj/item/bedsheet) - /obj/item/bedsheet/random) + new type(loc) + return INITIALIZE_HINT_QDEL + +/obj/item/bedsheet/dorms + name = "random dorms bedsheet" + icon_state = "sheetrandom" + item_state = "sheetrainbow" + desc = "If you're reading this description ingame, something has gone wrong! Honk!" + +/obj/item/bedsheet/dorms/Initialize() + ..() + var/type = pickweight(list("Colors" = 80, "Special" = 20)) + switch(type) + if("Colors") + type = pick(list(/obj/item/bedsheet, + /obj/item/bedsheet/blue, + /obj/item/bedsheet/green, + /obj/item/bedsheet/grey, + /obj/item/bedsheet/orange, + /obj/item/bedsheet/purple, + /obj/item/bedsheet/red, + /obj/item/bedsheet/yellow, + /obj/item/bedsheet/brown, + /obj/item/bedsheet/black)) + if("Special") + type = pick(list(/obj/item/bedsheet/rainbow, + /obj/item/bedsheet/ian, + /obj/item/bedsheet/nanotrasen)) + new type(loc) + return INITIALIZE_HINT_QDEL + + /obj/structure/bedsheetbin name = "linen bin" desc = "A linen bin. It looks rather cosy." diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index c41634cfa1c..2fed0cd8719 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -207,6 +207,7 @@ desc = "A collapsed roller bed that can be carried around." icon = 'icons/obj/rollerbed.dmi' icon_state = "folded" + drop_sound = 'sound/items/drop/axe.ogg' center_of_mass = list("x" = 17,"y" = 7) w_class = 4.0 // Can't be put in backpacks. Oh well. diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 9ca0e703a2c..e9ef3a7767d 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -292,6 +292,7 @@ BLIND // can't see anything user.drop_item() qdel(W) to_chat(user, "You attach a set of medical HUDs to your glasses.") + playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) var/turf/T = get_turf(src) new /obj/item/clothing/glasses/hud/health/prescription(T) qdel(src) @@ -299,6 +300,7 @@ BLIND // can't see anything user.drop_item() qdel(W) to_chat(user, "You attach a set of security HUDs to your glasses.") + playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) var/turf/T = get_turf(src) new /obj/item/clothing/glasses/hud/security/prescription(T) qdel(src) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 21b1b8d587c..54b5705fa34 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -31,6 +31,7 @@ /obj/item/clothing/glasses/hud/health/prescription/attack_self(mob/user) to_chat(user, "You detach a set of medical HUDs form your glasses.") + playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1) var/turf/T = get_turf(src) new /obj/item/clothing/glasses/hud/health(T) new /obj/item/clothing/glasses/regular(T) @@ -53,6 +54,7 @@ /obj/item/clothing/glasses/hud/security/prescription/attack_self(mob/user) to_chat(user, "You detach a set of security HUDs form your glasses.") + playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1) var/turf/T = get_turf(src) new /obj/item/clothing/glasses/hud/health(T) new /obj/item/clothing/glasses/regular(T) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 5e1b15de828..9706f40d6d0 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper_bin1" item_state = "sheet-metal" + drop_sound = 'sound/items/drop/box.ogg' throwforce = 1 w_class = 5 throw_speed = 3 diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index 3a5bfca6e93..85ea28a9714 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -11,6 +11,7 @@ sharp = 1 edge = 0 hitsound = "swing_hit" + drop_sound = 'sound/items/drop/sword.ogg' /obj/item/arrow/proc/removed() //Helper for metal rods falling apart. return @@ -25,6 +26,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "metal-rod" item_state = "bolt" + drop_sound = 'sound/items/drop/sword.ogg' /obj/item/arrow/quill name = "vox quill" @@ -33,6 +35,7 @@ icon_state = "quill" item_state = "quill" throwforce = 8 + drop_sound = 'sound/items/drop/knife.ogg' /obj/item/arrow/rod name = "metal rod" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d51ede84e16..da6e1f49285 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3869,6 +3869,7 @@ desc = "A box suited for pizzas." icon = 'icons/obj/food.dmi' icon_state = "pizzabox1" + drop_sound = 'sound/items/drop/box.ogg' center_of_mass = list("x" = 16,"y" = 6) var/open = 0 // Is the box open? @@ -5389,7 +5390,7 @@ /obj/item/reagent_containers/food/snacks/tuna name = "\improper Tuna Snax" - desc = "A packaged fish snack, guaranteed to do not contain space carp." + desc = "A packaged fish snack. Guaranteed to not contain space carp." icon_state = "tuna" filling_color = "#FFDEFE" center_of_mass = list("x"=17, "y"=13) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 571be542310..c5d724bc064 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -16,7 +16,7 @@ w_class = 2 flags = OPENCONTAINER unacidable = 1 //glass doesn't dissolve in acid - + drop_sound = 'sound/items/drop/bottle.ogg' var/label_text = "" /obj/item/reagent_containers/glass/Initialize() @@ -77,7 +77,6 @@ item_state = "beaker" center_of_mass = list("x" = 15,"y" = 11) matter = list("glass" = 500) - drop_sound = 'sound/items/drop/glass.ogg' /obj/item/reagent_containers/glass/beaker/Initialize() . = ..() diff --git a/html/changelogs/wezzy_new_bedsheet_inhands.yml b/html/changelogs/wezzy_new_bedsheet_inhands.yml new file mode 100644 index 00000000000..8be0e3d2d15 --- /dev/null +++ b/html/changelogs/wezzy_new_bedsheet_inhands.yml @@ -0,0 +1,47 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "New bedsheet, lantern and penlight inhands." + - tweak: "Extinguishing cigarettes in the ashtray should play the sound properly now." + - tweak: "You can put cigarette butts in cigarette packets." + - tweak: "Tweaks power drill sprites." + - tweak: "Health analysers should show the proper inhands now." + - bugfix: "Fixes some more drop sounds." + diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 55e17f983d2..00f14dc872b 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_bedsheet.dmi b/icons/mob/items/lefthand_bedsheet.dmi new file mode 100644 index 00000000000..b2bd0af1186 Binary files /dev/null and b/icons/mob/items/lefthand_bedsheet.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 93a95120146..f98831c28b1 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_bedsheet.dmi b/icons/mob/items/righthand_bedsheet.dmi new file mode 100644 index 00000000000..a684556366a Binary files /dev/null and b/icons/mob/items/righthand_bedsheet.dmi differ diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi index 290cc0807ef..b81ad969164 100644 Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index d78ceb18c5b..20918447d83 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/sound/items/drop/woodweapon.ogg b/sound/items/drop/woodweapon.ogg new file mode 100644 index 00000000000..517f9c015ac Binary files /dev/null and b/sound/items/drop/woodweapon.ogg differ