diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index 9cbe23dde2..bb82ebb111 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -21,7 +21,7 @@
var/static/list/acceptable_items // List of the items you can put in
var/static/list/available_recipes // List of the recipes you can use
var/static/list/acceptable_reagents // List of the reagents you can put in
-
+
var/static/max_n_of_items = 20
var/appliancetype = MICROWAVE
var/datum/looping_sound/microwave/soundloop
@@ -35,7 +35,7 @@
/obj/machinery/microwave/Initialize()
. = ..()
-
+
reagents = new/datum/reagents(100)
reagents.my_atom = src
@@ -47,7 +47,7 @@
var/datum/recipe/type = T
if((initial(type.appliance) & appliancetype))
available_recipes += new type
-
+
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/recipe in available_recipes)
@@ -302,7 +302,7 @@
cooked = fail()
cooked.forceMove(src.loc)
return
-
+
//Making multiple copies of a recipe
var/halftime = round(recipe.time*4/10/2)
if(!wzhzhzh(halftime))
@@ -396,7 +396,7 @@
icon_state = "mw"
updateUsrDialog()
soundloop.stop()
-
+
/obj/machinery/microwave/proc/stop()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
operating = FALSE // Turn it off again aferwards
@@ -471,12 +471,13 @@
switch(href_list["action"])
if ("cook")
+ playsound(loc, 'sound/machines/quiet_beep.ogg', 50, 1)
cook()
if ("dispose")
dispose()
return
-
+
/obj/machinery/microwave/verb/Eject()
set src in oview(1)
set category = "Object"
@@ -488,7 +489,7 @@
if(!do_after(usr, 1 SECONDS, target = src))
return
-
+
if(operating)
to_chat(usr, "You can't do that, [src] door is locked!")
return
@@ -524,7 +525,7 @@
/obj/item/holder
)
result = /obj/effect/decal/cleanable/blood/gibs
-
+
/datum/recipe/splat/before_cook(obj/container)
if(istype(container, /obj/machinery/microwave))
var/obj/machinery/microwave/M = container
diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm
index 95bc450c42..e6c1a7b3cd 100644
--- a/code/modules/research/designs/mining_toys.dm
+++ b/code/modules/research/designs/mining_toys.dm
@@ -48,3 +48,11 @@
materials = list(MAT_STEEL = 1000,"glass" = 1000)
build_path = /obj/item/depth_scanner
sort_string = "FBAAA"
+
+/datum/design/item/mining/pick_set
+ desc = "A rugged case containing a set of standardized picks used in archaeological digs."
+ id = "pick_set"
+ req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
+ materials = list(MAT_STEEL = 1700,"glass" = 200)
+ build_path = /obj/item/storage/excavation
+ sort_string = "FBAAB"
\ No newline at end of file
diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm
index cda00891d0..399561d05d 100644
--- a/code/modules/xenoarcheaology/tools/suspension_generator.dm
+++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm
@@ -1,8 +1,8 @@
/obj/machinery/suspension_gen
name = "suspension field generator"
- desc = "It has stubby legs bolted up against it's body for stabilising."
+ desc = "It has stubby bolts up against it's treads for stabilising."
icon = 'icons/obj/xenoarchaeology.dmi'
- icon_state = "suspension2"
+ icon_state = "suspension"
density = 1
req_access = list(access_research)
var/obj/item/cell/cell
@@ -134,11 +134,15 @@
else
anchored = 1
playsound(src, W.usesound, 50, 1)
- to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].")
+ to_chat(user, "You wrench the stabilising bolts [anchored ? "into place" : "loose"].")
if(anchored)
- desc = "It is resting securely on four stubby legs."
+ desc = "Its tracks are held firmly in place with securing bolts."
+ icon_state = "suspension_wrenched"
else
- desc = "It has stubby legs bolted up against it's body for stabilising."
+ desc = "It has stubby bolts aligned along it's tracks for stabilising."
+ icon_state = "suspension"
+ playsound(loc, 'sound/items/Ratchet.ogg', 40)
+ update_icon()
else
to_chat(user, "You are unable to secure [src] while it is active!")
else if (istype(W, /obj/item/cell))
@@ -186,7 +190,9 @@
suspension_field = new(T)
src.visible_message("[bicon(src)] [src] activates with a low hum.")
- icon_state = "suspension3"
+ icon_state = "suspension_on"
+ playsound(loc, 'sound/machines/quiet_beep.ogg', 40)
+ update_icon()
for(var/obj/item/I in T)
I.loc = suspension_field
@@ -213,7 +219,9 @@
src.visible_message("[bicon(src)] [src] deactivates with a gentle shudder.")
qdel(suspension_field)
suspension_field = null
- icon_state = "suspension2"
+ icon_state = "suspension_wrenched"
+ playsound(loc, 'sound/machines/quiet_beep.ogg', 40)
+ update_icon()
/obj/machinery/suspension_gen/Destroy()
deactivate()
@@ -239,6 +247,14 @@
return
src.set_dir(turn(src.dir, 270))
+/obj/machinery/suspension_gen/update_icon()
+ cut_overlays()
+ if(panel_open)
+ add_overlay("suspension_panel")
+ else
+ cut_overlay("suspension_panel")
+ . = ..()
+
/obj/effect/suspension_field
name = "energy field"
icon = 'icons/effects/effects.dmi'
diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm
index 452055c011..9e7aedde93 100644
--- a/code/modules/xenoarcheaology/tools/tools.dm
+++ b/code/modules/xenoarcheaology/tools/tools.dm
@@ -35,7 +35,7 @@
desc = "Aids in triangulation of exotic particles."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "xenoarch_scanner"
- item_state = "lampgreen"
+ item_state = "analyzer"
origin_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3)
matter = list(MAT_STEEL = 10000,"glass" = 5000)
w_class = ITEMSIZE_SMALL
@@ -85,6 +85,7 @@
to_chat(user, "Small anomaly detected in a radius of [nearestSimpleTargetDist]m.")
else
to_chat(user, "Background radiation levels detected.")
+ playsound(loc, 'sound/machines/boop2.ogg', 40)
else
to_chat(user, "Scanning array is recharging.")
@@ -93,7 +94,7 @@
desc = "Used to check spatial depth and density of rock outcroppings."
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "depth_scanner"
- item_state = "analyzer"
+ item_state = "xenoarch_device"
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2)
matter = list(MAT_STEEL = 1000,"glass" = 1000)
w_class = ITEMSIZE_SMALL
@@ -134,6 +135,7 @@
positive_locations.Add(D)
to_chat(user, "[bicon(src)] [src] pings.")
+ playsound(loc, 'sound/machines/twobeep.ogg', 40)
else if(istype(A, /obj/structure/boulder))
var/obj/structure/boulder/B = A
@@ -152,6 +154,7 @@
positive_locations.Add(D)
to_chat(user, "[bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!")
+ playsound(loc, 'sound/machines/triple_beep.ogg', 40)
/obj/item/depth_scanner/attack_self(var/mob/living/user)
interact(user)
diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
index 7285a7c8f1..f76b481b92 100644
--- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
+++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm
@@ -17,7 +17,7 @@
name = "2cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick1"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 2
digspeed = 20
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
@@ -30,7 +30,7 @@
name = "4cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick2"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 2
digspeed = 20
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
@@ -43,7 +43,7 @@
name = "6cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick3"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 3
digspeed = 20
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
@@ -56,7 +56,7 @@
name = "8cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick4"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 3
digspeed = 20
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
@@ -69,7 +69,7 @@
name = "10cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick5"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 5
digspeed = 20
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
@@ -82,7 +82,7 @@
name = "12cm pick"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick6"
- item_state = "syringe_0"
+ item_state = "xenoarch_pick"
force = 5
digspeed = 20
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
@@ -95,7 +95,7 @@
name = "hand pickaxe"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick_hand"
- item_state = "syringe_0"
+ item_state = "pickaxe"
force = 10
digspeed = 30
desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
@@ -111,10 +111,11 @@
name = "excavation pick set"
icon = 'icons/obj/storage.dmi'
icon_state = "excavation"
- desc = "A set of picks for excavation."
+ desc = "A rugged metal case containing a set of standardized picks used in archaeological digs."
item_state = "syringe_kit"
storage_slots = 7
w_class = ITEMSIZE_SMALL
+ origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2)
can_hold = list(/obj/item/pickaxe/brush,
/obj/item/pickaxe/one_pick,
/obj/item/pickaxe/two_pick,
@@ -172,6 +173,7 @@
force = 5
w_class = 2
attack_verb = list("drilled")
+ origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 5)
/obj/item/pickaxe/excavationdrill/attack_self(mob/user as mob)
var/depth = input("Put the desired depth (1-30 centimeters).", "Set Depth", 30) as num
@@ -197,3 +199,4 @@
/obj/item/pickaxe/excavationdrill/examine(mob/user)
. = ..()
. += "It is currently set at [excavation_amount]cms."
+
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 9e74099778..c0bc6e5f49 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 440f7fb9a1..9a44e80ad5 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 6bc7313547..cc4a4b52bf 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi
index 75809c26f9..2774e66718 100644
Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ
diff --git a/sound/machines/boop1.ogg b/sound/machines/boop1.ogg
new file mode 100644
index 0000000000..86eb5be006
Binary files /dev/null and b/sound/machines/boop1.ogg differ
diff --git a/sound/machines/boop2.ogg b/sound/machines/boop2.ogg
new file mode 100644
index 0000000000..76a47c5a9b
Binary files /dev/null and b/sound/machines/boop2.ogg differ
diff --git a/sound/machines/quiet_beep.ogg b/sound/machines/quiet_beep.ogg
new file mode 100644
index 0000000000..332d409591
Binary files /dev/null and b/sound/machines/quiet_beep.ogg differ
diff --git a/sound/machines/triple_beep.ogg b/sound/machines/triple_beep.ogg
new file mode 100644
index 0000000000..dcd3539c81
Binary files /dev/null and b/sound/machines/triple_beep.ogg differ