Metal Amount: [src.m_amount] / [max_m_amount] cm
3"
+ dat += "
Glass Amount: [src.g_amount] / [max_g_amount] cm
3
"
+ var/list/objs = list()
+ objs += src.L
+ if(src.hacked)
+ objs += src.LL
+ for(var/obj/t in objs)
+ if(disabled || m_amount
10 && !disabled)
+ dat += " x[10]"
+ if (max_multiplier>25 && !disabled)
+ dat += " x[25]"
+ if (max_multiplier>1 && !disabled)
+ dat += " x[max_multiplier]"
+ dat += " [t.m_amt] m / [t.g_amt] g"
+ else
+ dat += " [t.m_amt/coeff] m / [t.g_amt/coeff] g"
+ dat += "
"
+ dat += ""
+ else
+ dat = wires.GetInteractWindow()
+
+ var/datum/browser/popup = new(user, "autolathe", name, 400, 500)
+ popup.set_content(dat)
+ popup.open()
+ return
+
+/obj/machinery/autolathe/proc/shock(mob/user, prb)
+ if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
+ return 0
+ if(!prob(prb))
+ return 0
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
+ if (electrocute_mob(user, get_area(src), src, 0.7))
+ return 1
+ else
+ return 0
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 3fad5427a5b..2da2b7f1d9d 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -279,14 +279,14 @@ Auto Patrol: []"},
var/mob/living/carbon/M = src.target
var/maxstuns = 4
if (istype(M, /mob/living/carbon/human))
- if (M.stuttering < 10 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
- M.stuttering = 10
- M.Stun(10)
- M.Weaken(10)
+ if (M.stuttering < 5 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
+ M.stuttering = 5
+ M.Stun(5)
+ M.Weaken(5)
else
- M.Weaken(10)
- M.stuttering = 10
- M.Stun(10)
+ M.Weaken(5)
+ M.stuttering = 5
+ M.Stun(5)
maxstuns--
if (maxstuns <= 0)
target = null
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 0b530ea2614..7c2c15fed4d 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -227,14 +227,14 @@ Auto Patrol: []"},
var/mob/living/carbon/M = src.target
var/maxstuns = 4
if(istype(M, /mob/living/carbon/human))
- if(M.stuttering < 10 && (!(HULK in M.mutations)))
- M.stuttering = 10
- M.Stun(10)
- M.Weaken(10)
+ if(M.stuttering < 5 && (!(HULK in M.mutations)))
+ M.stuttering = 5
+ M.Stun(5)
+ M.Weaken(5)
else
- M.Weaken(10)
- M.stuttering = 10
- M.Stun(10)
+ M.Weaken(5)
+ M.stuttering = 5
+ M.Stun(5)
maxstuns--
if(maxstuns <= 0)
target = null
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index be3e360bb35..5f0e35b08ec 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -297,7 +297,7 @@ That prevents a few funky behaviors.
C.name = "inteliCard"
C.overlays.Cut()
A.loc = T
- T.occupant = A
+ T.occupier = A
A.control_disabled = 1
if (A.stat == 2)
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404")
@@ -308,25 +308,25 @@ That prevents a few funky behaviors.
A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
else
- if(!C.contents.len && T.occupant && !T.active)
- C.name = "inteliCard - [T.occupant.name]"
+ if(!C.contents.len && T.occupier && !T.active)
+ C.name = "inteliCard - [T.occupier.name]"
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
- if (T.occupant.stat == 2)
+ if (T.occupier.stat == 2)
C.icon_state = "aicard-404"
T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404")
else
C.icon_state = "aicard-full"
T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full")
- T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
- U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
- T.occupant.loc = C
- T.occupant.cancel_camera()
- T.occupant = null
+ T.occupier << "You have been downloaded to a mobile storage device. Still no remote access."
+ U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+ T.occupier.loc = C
+ T.occupier.cancel_camera()
+ T.occupier = null
else if (C.contents.len)
U << "\red ERROR: \black Artificial intelligence detected on terminal."
else if (T.active)
U << "\red ERROR: \black Reconstruction in progress."
- else if (!T.occupant)
+ else if (!T.occupier)
U << "\red ERROR: \black Unable to locate artificial intelligence."
if("NINJASUIT")
var/obj/item/clothing/suit/space/space_ninja/C = src
@@ -336,7 +336,7 @@ That prevents a few funky behaviors.
else
var/mob/living/silicon/ai/A = C.AI
A.loc = T
- T.occupant = A
+ T.occupier = A
C.AI = null
A.control_disabled = 1
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
@@ -345,22 +345,22 @@ That prevents a few funky behaviors.
A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
else
- if(!C.AI && T.occupant && !T.active)
- if (T.occupant.stat)
- U << "\red ERROR: \black [T.occupant.name] data core is corrupted. Unable to install."
+ if(!C.AI && T.occupier && !T.active)
+ if (T.occupier.stat)
+ U << "\red ERROR: \black [T.occupier.name] data core is corrupted. Unable to install."
else
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full")
- T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
- U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
- T.occupant.loc = C
- T.occupant.cancel_camera()
- T.occupant = null
+ T.occupier << "You have been downloaded to a mobile storage device. Still no remote access."
+ U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+ T.occupier.loc = C
+ T.occupier.cancel_camera()
+ T.occupier = null
else if (C.AI)
U << "\red ERROR: \black Artificial intelligence detected on terminal."
else if (T.active)
U << "\red ERROR: \black Reconstruction in progress."
- else if (!T.occupant)
+ else if (!T.occupier)
U << "\red ERROR: \black Unable to locate artificial intelligence."
if("NINJASUIT")//Ninjasuit
var/obj/item/clothing/suit/space/space_ninja/T = target
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 7f4410897de..6dfa1f4dd5f 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -37,8 +37,10 @@
/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob)
if(..())
return
+ interact(user)
+
+/obj/machinery/computer/aifixer/interact(mob/user)
- user.set_machine(src)
var/dat = ""
if (src.occupier)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 8b27581886e..0d29218a025 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -103,7 +103,7 @@
/obj/machinery/computer/security/telescreen/entertainment
name = "entertainment monitor"
desc = "Damn, they better have the /tg/ channel on these things."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/status_display.dmi'
icon_state = "entertainment"
network = list("thunder")
density = 0
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 2202dcf3c0b..68c1f1204f0 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -11,9 +11,7 @@
/obj/machinery/computer/New()
..()
- if(ticker)
- initialize()
-
+ power_change()
/obj/machinery/computer/initialize()
power_change()
@@ -122,23 +120,23 @@
/obj/machinery/computer/attack_paw(mob/user)
if(circuit)
if(prob(10))
- user.visible_message("[user.name] smashes the [src.name] with /his paws.",\
+ user.visible_message("[user.name] smashes the [src.name] with its paws.",\
"You smash the [src.name] with your paws.",\
"You hear a smashing sound.")
set_broken()
return
- user.visible_message("[user.name] smashes against the [src.name] with /his paws.",\
+ user.visible_message("[user.name] smashes against the [src.name] with its paws.",\
"You smash against the [src.name] with your paws.",\
"You hear a clicking sound.")
/obj/machinery/computer/attack_alien(mob/user)
if(circuit)
if(prob(80))
- user.visible_message("[user.name] smashes the [src.name] with /his claws.",\
+ user.visible_message("[user.name] smashes the [src.name] with its claws.",\
"You smash the [src.name] with your claws.",\
"You hear a smashing sound.")
set_broken()
return
- user.visible_message("[user.name] smashes against the [src.name] with /his claws.",\
- "You smash against the [src.name] with your claws.",\
- "You hear a clicking sound.")
\ No newline at end of file
+ user.visible_message("[user.name] smashes against the [src.name] with its claws.",\
+ "You smash against the [src.name] with your claws.",\
+ "You hear a clicking sound.")
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 01f089ad2a6..ba0111c70f5 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -169,18 +169,22 @@ to destroy them and players will be able to make replacements.
req_components = list(
"/obj/item/weapon/vending_refill/boozeomat" = 3)
-/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/weapon/screwdriver))
- var/list/names = list(/obj/machinery/vending/boozeomat = "Booze-O-Mat",
- /obj/machinery/vending/coffee = "Getmore Chocolate Corp",
- /obj/machinery/vending/snack = "Hot Drinks",
+ var/list/names_paths = list(/obj/machinery/vending/boozeomat = "Booze-O-Mat",
+ /obj/machinery/vending/coffee = "Hot Drinks",
+ /obj/machinery/vending/snack = "Getmore Chocolate Corp",
/obj/machinery/vending/cola = "Robust Softdrinks",
/obj/machinery/vending/cigarette = "Cigarette",
/obj/machinery/vending/autodrobe = "AutoDrobe")
- build_path = pick(names)
- name = "circuit board ([names[build_path]] Vendor)"
- user << "You set the board to [names[build_path]]."
+/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user)
+ if(istype(I, /obj/item/weapon/screwdriver))
+ set_type(pick(names_paths), user)
+
+
+/obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user)
+ build_path = typepath
+ name = "circuit board ([names_paths[build_path]] Vendor)"
+ user << "You set the board to [names_paths[build_path]]."
req_components = list("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]" = 3) //Never before has i used a method as horrible as this one, im so sorry
/obj/item/weapon/circuitboard/smes
@@ -304,16 +308,16 @@ to destroy them and players will be able to make replacements.
"/obj/item/weapon/stock_parts/manipulator" = 1,
"/obj/item/stack/cable_coil" = 1,
"/obj/item/weapon/stock_parts/console_screen" = 1)
-/*
+
/obj/item/weapon/circuitboard/hydroponics
name = "circuit board (Hydroponics Tray)"
build_path = /obj/machinery/hydroponics/constructable
board_type = "machine"
origin_tech = "programming=1;biotech=1"
req_components = list(
- "/obj/item/weapon/reagent_containers/glass/beaker" = 2,
+ "/obj/item/weapon/stock_parts/matter_bin" = 2,
"/obj/item/weapon/stock_parts/console_screen" = 1)
-*/
+
/obj/item/weapon/circuitboard/microwave
name = "circuit board (Microwave)"
build_path = /obj/machinery/microwave
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 7d01c11e0f9..764857861de 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -611,7 +611,7 @@ About the new airlock wires panel:
if(!istype(H.head, /obj/item/clothing/head/helmet))
visible_message("\red [user] headbutts the airlock.")
var/obj/item/organ/limb/affecting = H.get_organ("head")
- H.Stun(8)
+ H.Stun(5)
H.Weaken(5)
if(affecting.take_damage(10, 0))
H.update_damage_overlays(0)
diff --git a/code/game/machinery/drying_rack.dm b/code/game/machinery/drying_rack.dm
deleted file mode 100644
index 68399311f63..00000000000
--- a/code/game/machinery/drying_rack.dm
+++ /dev/null
@@ -1,85 +0,0 @@
-/obj/machinery/drying_rack
- name = "drying rack"
- desc = "A large rack with a heater built into the base. Used for drying things out."
- icon = 'icons/obj/hydroponics.dmi'
- icon_state = "drying_rack"
- layer = 2.9
- density = 1
- anchored = 1
- use_power = 1
- idle_power_usage = 5
- active_power_usage = 50
- var/list/accepted = list()
- var/running = 0
- var/volume = 100
-
-/obj/machinery/drying_rack/New()
- ..()
- flags |= NOREACT
- create_reagents(volume)
-
-
-/obj/machinery/drying_rack/attackby(var/obj/item/I as obj, var/mob/user as mob)
- if(running)
- user << "You cannot add that to the drying rack."
- return
- var/obj/item/weapon/reagent_containers/food/snacks/S = I
- if(!S.dried_type)
- user << "You cannot add that to the drying rack."
- return
- if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/grown))
- var/obj/item/weapon/reagent_containers/food/snacks/grown/P = I
- var/T = P.dried_type
- if(ispath(T,/obj/item/weapon/reagent_containers/food/snacks/grown))
- if(P.dry == 0)
- P.reagents.trans_to(src, P.reagents.total_volume)
- if(!user.unEquip(I))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
- user << "You add the [I] to the drying rack."
- qdel(I)
- src.running = 1
- use_power = 2
- icon_state = "drying_rack_on"
- sleep(60)
- icon_state = "drying_rack"
- var/obj/item/weapon/reagent_containers/food/snacks/grown/Dried = new T(src.loc)
- user << "[Dried] has finished drying."
- Dried.color = "#ad7257"
- Dried.dry = 1
- Dried.reagents.clear_reagents()
- src.reagents.trans_to(Dried, src.reagents.total_volume)
- use_power = 1
- src.running = 0
- return
- else
- user << "That has already been dried."
- else
- if(!user.unEquip(I))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
- user << "You add the [I] to the drying rack."
- qdel(I)
- src.running = 1
- use_power = 2
- icon_state = "drying_rack_on"
- sleep(60)
- icon_state = "drying_rack"
- new T(src.loc)
- use_power = 1
- src.running = 0
- else
- var/N = S.dried_type
- if(!user.unEquip(I))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
- user << "You add the [I] to the drying rack."
- qdel(I)
- src.running = 1
- use_power = 2
- icon_state = "drying_rack_on"
- sleep(60)
- icon_state = "drying_rack"
- new N(src.loc)
- use_power = 1
- src.running = 0
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 180da00b5a5..72e0126433d 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -9,7 +9,7 @@
var/id = null
var/range = 2 //this is roughly the size of brig cell
var/last_flash = 0 //Don't want it getting spammed like regular flashes
- var/strength = 10 //How weakened targets are when flashed.
+ var/strength = 5 //How weakened targets are when flashed.
var/base_state = "mflash"
anchored = 1
@@ -17,7 +17,7 @@
name = "portable flasher"
desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements."
icon_state = "pflash1-p"
- strength = 8
+ strength = 4
anchored = 0
base_state = "pflash"
density = 1
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index 38417931b24..94430c382ce 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -12,7 +12,7 @@
idle_power_usage = 5
active_power_usage = 100
flags = NOREACT
- var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
+ var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't like things over 1000.
var/icon_on = "smartfridge"
var/icon_off = "smartfridge-off"
var/item_quants = list()
@@ -35,6 +35,7 @@
/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(default_unfasten_wrench(user, O))
+ power_change()
return
if(stat)
return 0
@@ -132,7 +133,7 @@
/obj/machinery/smartfridge/interact(mob/user as mob)
if(stat)
- return
+ return 0
var/dat = "Select an item:
"
@@ -153,57 +154,19 @@
dat += "(x25)"
if(N > 1)
dat += "(All)"
- /*
- if((findtext(O,"seeds") || findtext(O,"mycelium")) && N>1)
- var/max_bags = round((N-1)/7)+1
- dat += "(1 Bag)"
- if(max_bags > 2) // at least 14
- dat += "(2 Bags)"
- if(max_bags > 5) // at least 35
- dat += "(5 Bags)"
- if(max_bags > 1)
- dat += "(Bag All)"
- */
+
dat += "
"
dat += ""
- user << browse("[src] Supplies[dat]", "window=smartfridge")
+ user << browse("[src] supplies[dat]", "window=smartfridge")
onclose(user, "smartfridge")
- return
+ return dat
/obj/machinery/smartfridge/Topic(var/href, var/list/href_list)
if(..())
return
usr.set_machine(src)
- /*
- if(href_list["bagvend"]) // bag seeds and dispense
- var/N = href_list["bagvend"]
- var/amount = text2num(href_list["amount"])
- if(item_quants[N] <= 0) // Sanity check, there are probably ways to press the button when it shouldn't be possible.
- return
-
- item_quants[N] = max(item_quants[N] - amount*7, 0)
-
- var/i = amount * 7
- var/j = 0
- var/obj/item/weapon/storage/bag/seeds/SB = new(loc)
- for(var/obj/O in contents)
- if(name_filter(O.name) == N)
- O.loc = SB
- i--
- j++
- if(i <= 0)
- break
- if(j >= 7)
- j = 0
- SB.update_icon()
- SB = new(loc)
- SB.update_icon()
-
- src.updateUsrDialog()
- return
- */
var/N = href_list["vend"]
var/amount = text2num(href_list["amount"])
@@ -223,6 +186,95 @@
src.updateUsrDialog()
return
+
+// ----------------------------
+// Drying Rack 'smartfridge'
+// ----------------------------
+/obj/machinery/smartfridge/drying_rack
+ name = "drying rack"
+ icon = 'icons/obj/hydroponics.dmi'
+ icon_state = "drying_rack_on"
+ use_power = 1
+ idle_power_usage = 5
+ active_power_usage = 200
+ icon_on = "drying_rack_on"
+ icon_off = "drying_rack"
+ var/drying = 0
+
+/obj/machinery/smartfridge/drying_rack/interact(mob/user as mob)
+ var/dat = ..()
+ if(dat)
+ dat += "
"
+ dat += "Toggle Drying "
+ user << browse("[src] supplies[dat]", "window=smartfridge")
+ onclose(user, "smartfridge")
+
+/obj/machinery/smartfridge/drying_rack/Topic(var/href, var/list/href_list)
+ ..()
+ if(href_list["dry"])
+ toggle_drying()
+ src.updateUsrDialog()
+
+/obj/machinery/smartfridge/drying_rack/power_change()
+ if(powered() && anchored)
+ stat &= ~NOPOWER
+ else
+ stat |= NOPOWER
+ toggle_drying(1)
+ update_icon()
+
+obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay
+ ..()
+ update_icon()
+
+/obj/machinery/smartfridge/drying_rack/update_icon()
+ ..()
+ overlays = 0
+ if(drying)
+ overlays += "drying_rack_drying"
+ if(contents.len)
+ overlays += "drying_rack_filled"
+
+/obj/machinery/smartfridge/drying_rack/process()
+ ..()
+ if(drying)
+ if(rack_dry())//no need to update unless something got dried
+ update_icon()
+
+/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
+ if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/))
+ var/obj/item/weapon/reagent_containers/food/snacks/S = O
+ if(S.dried_type)
+ return 1
+ return 0
+
+/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(var/forceoff = 0)
+ if(drying || forceoff)
+ drying = 0
+ use_power = 1
+ else
+ drying = 1
+ use_power = 2
+ update_icon()
+
+/obj/machinery/smartfridge/drying_rack/proc/rack_dry()
+ for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
+ if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
+ S.color = "#ad7257"
+ S.dry = 1
+ S.loc = get_turf(src)
+ else
+ var/dried = S.dried_type
+ new dried(src.loc)
+ del S
+ return 1
+ return 0
+
+/obj/machinery/smartfridge/drying_rack/emp_act(severity)
+ ..()
+ atmos_spawn_air(SPAWN_HEAT, 75)
+
+
// ----------------------------
// Bar drink smartfridge
// ----------------------------
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 5bb90f4cdfc..76f45444690 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -43,9 +43,6 @@ Class Variables:
MAINT:8 -- machine is currently under going maintenance.
EMPED:16 -- temporary broken by EMP pulse
- manual (num)
- Currently unused.
-
Class Procs:
New() 'game/machinery/machine.dm'
@@ -106,7 +103,6 @@ Class Procs:
//EQUIP,ENVIRON or LIGHT
var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames.
var/uid
- var/manual = 0
var/global/gl_uid = 1
var/panel_open = 0
var/state_open = 0
@@ -280,8 +276,8 @@ Class Procs:
uid = gl_uid
gl_uid++
-/obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C)
- if(istype(C) && panel_open)
+/obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0)
+ if(istype(C) && (panel_open || ignore_panel))
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
M.state = 2
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index e813de55b9c..d61307589bf 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -7,7 +7,7 @@
name = "suit storage unit"
desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\"."
icon = 'icons/obj/suitstorage.dmi'
- icon_state = "suitstorage000000100" //order is: [has helmet][has suit][has human][is open][is locked][is UV cycling][is powered][is dirty/broken] [is superUVcycling]
+ icon_state = "close"
anchored = 1
density = 1
var/mob/living/carbon/human/OCCUPANT = null
@@ -45,18 +45,28 @@
if(MASK_TYPE)
MASK = new MASK_TYPE(src)
-/obj/machinery/suit_storage_unit/update_icon()
- var/hashelmet = 0
- var/hassuit = 0
- var/hashuman = 0
- if(HELMET)
- hashelmet = 1
- if(SUIT)
- hassuit = 1
- if(OCCUPANT)
- hashuman = 1
- icon_state = text("suitstorage[][][][][][][][][]",hashelmet,hassuit,hashuman,src.isopen,src.islocked,src.isUV,src.ispowered,src.isbroken,src.issuperUV)
+/obj/machinery/suit_storage_unit/update_icon() //overlays yaaaay - Jordie
+ src.overlays = 0
+ if(!isopen)
+ overlays += "close"
+ if(OCCUPANT)
+ overlays += "human"
+ if(OCCUPANT && isUV)
+ overlays += "uvhuman"
+ if(isUV)
+ overlays += "uv"
+ if(issuperUV && isUV)
+ overlays += "super"
+ if(isopen)
+ overlays += "open"
+ if(SUIT && isopen)
+ overlays += "suit"
+ if(HELMET && isopen)
+ overlays += "helm"
+ if(isbroken && isopen)
+ overlays += "broken"
+ return
/obj/machinery/suit_storage_unit/power_change()
if( powered() )
@@ -524,7 +534,7 @@
return
return
if( istype(I,/obj/item/clothing/suit/space) )
- if(!src.isopen)
+ if(!src.isopen || src.isbroken)
return
var/obj/item/clothing/suit/space/S = I
if(src.SUIT)
@@ -538,7 +548,7 @@
src.updateUsrDialog()
return
if( istype(I,/obj/item/clothing/head/helmet) )
- if(!src.isopen)
+ if(!src.isopen || src.isbroken)
return
var/obj/item/clothing/head/helmet/H = I
if(src.HELMET)
@@ -552,7 +562,7 @@
src.updateUsrDialog()
return
if( istype(I,/obj/item/clothing/mask) )
- if(!src.isopen)
+ if(!src.isopen || src.isbroken)
return
var/obj/item/clothing/mask/M = I
if(src.MASK)
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 9e62095048d..a3098d0580e 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -102,6 +102,9 @@
/obj/machinery/syndicatebomb/attack_hand(var/mob/user)
interact(user)
+/obj/machinery/syndicatebomb/attack_ai()
+ return
+
/obj/machinery/syndicatebomb/interact(var/mob/user)
if(wires)
wires.Interact(user)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 76c9ce99629..2a82e922b3d 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -43,29 +43,32 @@
var/scan_id = 1
var/obj/item/weapon/coin/coin
var/datum/wires/vending/wires = null
- var/deconstructable = 0
var/obj/item/weapon/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
/obj/machinery/vending/New()
..()
- component_parts = list()
- component_parts += new /obj/item/weapon/circuitboard/vendor(null)
wires = new(src)
spawn(4)
slogan_list = text2list(product_slogans, ";")
-
// So not all machines speak at the exact same time.
// The first time this machine says something will be at slogantime + this random value,
// so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
last_slogan = world.time + rand(0, slogan_delay)
-
- build_inventory(products)
- //Add hidden inventory
- build_inventory(contraband, 1)
- build_inventory(premium, 0, 1)
power_change()
+/obj/machinery/vending/initialize()
+ build_inventory(products)
+ build_inventory(contraband, 1)
+ build_inventory(premium, 0, 1)
+
+/obj/machinery/vending/RefreshParts() //Better would be to make constructable child
+ if(component_parts)
+ build_inventory(products, start_empty = 1)
+ build_inventory(contraband, 1, 1)
+ build_inventory(premium, 0, 1, 1)
+ for(var/obj/item/weapon/vending_refill/VR in component_parts)
+ refill_inventory(VR, product_records)
/obj/machinery/vending/ex_act(severity)
switch(severity)
@@ -88,16 +91,17 @@
qdel(src)
-/obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0)
+/obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0, start_empty = null)
for(var/typepath in productlist)
var/amount = productlist[typepath]
- if(isnull(amount)) amount = 1
+ if(isnull(amount)) amount = 0
var/atom/temp = new typepath(null)
var/datum/data/vending_product/R = new /datum/data/vending_product()
R.product_name = initial(temp.name)
R.product_path = typepath
- R.amount = amount
+ if(!start_empty)
+ R.amount = amount
R.max_amount = amount
R.display_color = pick("red","blue","green")
@@ -107,7 +111,6 @@
coin_records += R
else
product_records += R
-// world << "Added: [R.product_name]] - [R.amount] - [R.product_path]"
/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine, mob/user)
var/total = 0
@@ -119,7 +122,6 @@
refill.charges--
total++
to_restock += machine_content.max_amount - machine_content.amount
-
if(to_restock <= refill.charges)
for(var/datum/data/vending_product/machine_content in machine)
machine_content.amount = machine_content.max_amount
@@ -144,8 +146,15 @@
if(default_unfasten_wrench(user, W, time = 60))
return
- if(deconstructable && istype(W, /obj/item/weapon/crowbar))
- malfunction()
+ if(component_parts && istype(W, /obj/item/weapon/crowbar))
+ var/datum/data/vending_product/machine = product_records
+ for(var/datum/data/vending_product/machine_content in machine)
+ while(machine_content.amount !=0)
+ for(var/obj/item/weapon/vending_refill/VR in component_parts)
+ VR.charges++
+ machine_content.amount--
+ if(!machine_content.amount)
+ break
default_deconstruction_crowbar(W)
if(istype(W, /obj/item/weapon/card/emag))
@@ -503,7 +512,18 @@
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
req_access_txt = "25"
refill_canister = /obj/item/weapon/vending_refill/boozeomat
- deconstructable = 1
+
+
+/obj/machinery/vending/boozeomat/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/boozeomat(0)
+ component_parts += new /obj/item/weapon/vending_refill/boozeomat(0)
+ component_parts += new /obj/item/weapon/vending_refill/boozeomat(0)
+
/obj/machinery/vending/assist
products = list( /obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4,
@@ -521,9 +541,18 @@
products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
refill_canister = /obj/item/weapon/vending_refill/coffee
- deconstructable = 1
+/obj/machinery/vending/coffee/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/coffee(0)
+ component_parts += new /obj/item/weapon/vending_refill/coffee(0)
+ component_parts += new /obj/item/weapon/vending_refill/coffee(0)
+
/obj/machinery/vending/snack
name = "\improper Getmore Chocolate Corp"
desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars"
@@ -535,9 +564,18 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6)
refill_canister = /obj/item/weapon/vending_refill/snack
- deconstructable = 1
+/obj/machinery/vending/snack/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/snack(0)
+ component_parts += new /obj/item/weapon/vending_refill/snack(0)
+ component_parts += new /obj/item/weapon/vending_refill/snack(0)
+
/obj/machinery/vending/sustenance
name = "\improper Sustenance Vendor"
desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement."
@@ -562,7 +600,17 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 5)
refill_canister = /obj/item/weapon/vending_refill/cola
- deconstructable = 1
+
+
+/obj/machinery/vending/cola/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/cola(0)
+ component_parts += new /obj/item/weapon/vending_refill/cola(0)
+ component_parts += new /obj/item/weapon/vending_refill/cola(0)
//This one's from bay12
/obj/machinery/vending/cart
@@ -587,7 +635,17 @@
contraband = list(/obj/item/weapon/lighter/zippo = 4)
premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2)
refill_canister = /obj/item/weapon/vending_refill/cigarette
- deconstructable = 1
+
+
+/obj/machinery/vending/cigarette/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/cigarette(0)
+ component_parts += new /obj/item/weapon/vending_refill/cigarette(0)
+ component_parts += new /obj/item/weapon/vending_refill/cigarette(0)
/obj/machinery/vending/medical
name = "\improper NanoMed Plus"
@@ -651,7 +709,7 @@
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
icon_state = "nutri"
icon_deny = "nutri-deny"
- products = list(/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/pestspray = 20,
+ products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 45,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 25,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 15,/obj/item/weapon/reagent_containers/spray/pestspray = 20,
/obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5)
contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
@@ -661,13 +719,14 @@
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
- products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3,
- /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,
- /obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
- /obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
- /obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/cabbageseed = 3,
- /obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/coffee_arabica_seed = 3,/obj/item/seeds/tobacco_seed = 3,
- /obj/item/seeds/tea_aspera_seed = 3)
+ products = list(/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/appleseed = 3,/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,
+ /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/chantermycelium = 3,
+ /obj/item/seeds/chiliseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/coffee_arabica_seed = 3,/obj/item/seeds/cornseed = 3,
+ /obj/item/seeds/eggplantseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/lemonseed = 3,
+ /obj/item/seeds/limeseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/potatoseed = 3,/obj/item/seeds/poppyseed = 3,
+ /obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,/obj/item/seeds/sunflowerseed = 3,
+ /obj/item/seeds/tea_aspera_seed = 3,/obj/item/seeds/tobacco_seed = 3,/obj/item/seeds/tomatoseed = 3,
+ /obj/item/seeds/towermycelium = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/whitebeetseed = 3)
contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
@@ -708,11 +767,22 @@
/obj/item/clothing/suit/wizrobe/marisa/fake = 1,/obj/item/clothing/under/sundress = 1,/obj/item/clothing/head/witchwig = 1,/obj/item/weapon/staff/broom = 1,
/obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1,
/obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1,
- /obj/item/clothing/head/rabbitears =1) //Pretty much everything that had a chance to spawn.
+ /obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero, /obj/item/clothing/head/sombrero/green =1, /obj/item/clothing/suit/poncho = 1,
+ /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1,) //Pretty much everything that had a chance to spawn.
contraband = list(/obj/item/clothing/suit/cardborg = 1,/obj/item/clothing/head/cardborg = 1,/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1)
premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
- deconstructable = 1
+
+
+/obj/machinery/vending/autodrobe/New()
+ ..()
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/vendor/V = new(null)
+ V.set_type(type)
+ component_parts += V
+ component_parts += new /obj/item/weapon/vending_refill/autodrobe(0)
+ component_parts += new /obj/item/weapon/vending_refill/autodrobe(0)
+ component_parts += new /obj/item/weapon/vending_refill/autodrobe(0)
/obj/machinery/vending/dinnerware
name = "dinnerware"
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index ff581856e02..5d8f46eff63 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -2,7 +2,7 @@
desc = "A lightweight, security exosuit. Popular among private and corporate security."
name = "\improper Gygax"
icon_state = "gygax"
- step_in = 2
+ step_in = 3
dir_in = 1 //Facing North.
health = 250
deflect_chance = 5
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index e2187fe69e0..85ba2351add 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -2,7 +2,7 @@
desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!"
name = "\improper H.O.N.K"
icon_state = "honker"
- step_in = 2
+ step_in = 3
health = 140
deflect_chance = 60
internal_damage_threshold = 60
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index f5fec85debe..e04b0450df1 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -201,7 +201,7 @@
name = "\improper FNX-99 \"Hades\" Carbine"
icon_state = "mecha_carbine"
equip_cooldown = 5
- projectile = /obj/item/projectile/bullet/mechincendiary
+ projectile = /obj/item/projectile/bullet/incendiary/mech
projectiles = 24
projectile_energy_cost = 15
@@ -355,7 +355,8 @@
message_admins("[key_name(chassis.occupant, chassis.occupant.client)](?) fired a [src] in ([T.x],[T.y],[T.z] - JMP)",0,1)
log_game("[chassis.occupant.ckey]([chassis.occupant]) fired a [src] ([T.x],[T.y],[T.z])")
spawn(det_time)
- F.prime()
+ if(F)
+ F.prime()
do_after_cooldown()
return
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index cbf37752fdb..80def9966bb 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -2,7 +2,7 @@
desc = "These exosuits are developed and produced by Vey-Med. (© All rights reserved)."
name = "\improper Odysseus"
icon_state = "odysseus"
- step_in = 2
+ step_in = 3
max_temperature = 15000
health = 120
wreckage = /obj/structure/mecha_wreckage/odysseus
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 9d917436f88..a1a367abe7b 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -29,7 +29,7 @@
desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE"
name = "\improper DEATH-RIPLEY"
icon_state = "deathripley"
- step_in = 2
+ step_in = 3
opacity=0
lights_power = 60
wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index b11e00c73ee..79b77551cc7 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -196,7 +196,7 @@
if(I.attack_verb.len)
visible_message("[src] has been [pick(I.attack_verb)] with [I] by [user].")
else
- visible_message("[src] has been attacked with [I] by [user].")
+ visible_message("[src] has been attacked with [I] by [user]!")
var/damage = I.force / 4.0
if(istype(I, /obj/item/weapon/weldingtool))
@@ -325,7 +325,7 @@
if(I.attack_verb.len)
visible_message("[src] has been [pick(I.attack_verb)] with [I] by [user].")
else
- visible_message("[src] has been attacked with [I] by [user].")
+ visible_message("[src] has been attacked with [I] by [user]!")
var/damage = I.force / 4
if(istype(I, /obj/item/weapon/weldingtool))
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 08c13ebbde7..6000c9978e5 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -547,7 +547,8 @@ steam.start() -- spawns the effect
sleep(10)
step(smoke,direction)
spawn(150+rand(10,30))
- smoke.delete()
+ if(smoke)
+ smoke.delete()
src.total_smoke--
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 821466170c6..9ab7d961e07 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -27,6 +27,8 @@
src.loc = loc
src.target = target
src.creator = creator
+ for(var/mob/M in src.loc)
+ src.teleport(M)
if(lifespan > 0)
spawn(lifespan)
qdel(src)
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 3bb8ae6b687..fe249a1b72e 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -22,9 +22,9 @@
/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user)
if(W.attack_verb.len)
- visible_message("\red \The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")
+ visible_message("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]!")
else
- visible_message("\red \The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")
+ visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]!")
var/damage = W.force / 4.0
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0411c90eb33..e9c3943aaf7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -350,6 +350,8 @@
return 0
return 1
if(slot_l_store)
+ if(flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them.
+ return 0
if(H.l_store)
return 0
if(!H.w_uniform)
@@ -361,6 +363,8 @@
if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
return 1
if(slot_r_store)
+ if(flags & NODROP)
+ return 0
if(H.r_store)
return 0
if(!H.w_uniform)
@@ -373,6 +377,8 @@
return 1
return 0
if(slot_s_store)
+ if(flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this.
+ return 0
if(H.s_store)
return 0
if(!H.wear_suit)
@@ -541,7 +547,7 @@
M.drop_item()
M.eye_blurry += 10
M.Paralyse(1)
- M.Weaken(4)
+ M.Weaken(2)
if (prob(M.eye_stat - 10 + 1))
if(M.stat != 2)
M << "\red You go blind!"
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index 2789b00bc3f..208a2111da1 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -24,7 +24,7 @@
if (!istype(loc, /turf/simulated/floor))
usr << "\red APC cannot be placed on this spot."
return
- if (A.requires_power == 0 || A.name == "Space")
+ if (A.requires_power == 0 || istype(A, /area/space))
usr << "\red APC cannot be placed in this area."
return
if (A.get_apc())
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 152377dff1c..e671f5d4d11 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -80,7 +80,7 @@ move an amendment to the drawing.
return A
/obj/item/blueprints/proc/get_area_type(var/area/A = get_area())
- if (A.name == "Space")
+ if (istype(A,/area/space))
return AREA_SPACE
var/list/SPECIALS = list(
/area/shuttle,
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 62fae59f193..223e28d7437 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -68,7 +68,7 @@
if(iscarbon(M))
var/safety = M:eyecheck()
if(safety <= 0)
- M.Weaken(10)
+ M.Weaken(5)
flick("e_flash", M.flash)
if(ishuman(M) && ishuman(user) && M.stat != DEAD)
@@ -179,7 +179,7 @@
var/mob/living/carbon/M = loc
var/safety = M.eyecheck()
if(safety <= 0)
- M.Weaken(10)
+ M.Weaken(5)
flick("e_flash", M.flash)
for(var/mob/O in viewers(M, null))
O.show_message("[M] is blinded by the flash!")
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 7a8e100ceb0..482db3a9d23 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -102,7 +102,7 @@
s.set_up(3, 1, M)
s.start()
- M.Weaken(10)
+ M.Weaken(5)
if(master && !isWireCut(WIRE_SIGNAL))
master.receive_signal()
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 11686a77781..6a681816ad7 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -6,19 +6,29 @@ A list of items and costs is stored under the datum of every game mode, alongsid
*/
+var/list/world_uplinks = list()
+
/obj/item/device/uplink
var/welcome // Welcoming menu message
var/uses // Numbers of crystals
// List of items not to shove in their hands.
- var/list/purchase_log = list()
+ var/purchase_log = ""
var/show_description = null
var/active = 0
+ var/uplink_owner = null//text-only
+ var/used_TC = 0
+
/obj/item/device/uplink/New()
..()
+ world_uplinks+=src
welcome = ticker.mode.uplink_welcome
uses = ticker.mode.uplink_uses
+/obj/item/device/uplink/Del()
+ world_uplinks-=src
+ ..()
+
//Let's build a menu!
/obj/item/device/uplink/proc/generate_menu()
diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm
index d37dee969c1..f37aa0b3ec5 100644
--- a/code/game/objects/items/devices/violin.dm
+++ b/code/game/objects/items/devices/violin.dm
@@ -11,7 +11,7 @@
/obj/item/device/violin/New()
song = new("violin", src)
- song.instrumentExt = "mid"
+ song.instrumentExt = "ogg"
/obj/item/device/violin/attack_self(mob/user as mob)
interact(user)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 17eaf2175ae..6ea4481b24a 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -95,7 +95,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("drying rack", /obj/machinery/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \
)
/obj/item/stack/sheet/wood
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 797f56e1fdf..f622413ce9c 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -173,7 +173,7 @@
/obj/item/stack/attack_hand(mob/user as mob)
if (user.get_inactive_hand() == src)
- var/obj/item/stack/F = new src.type( user, amount=1)
+ var/obj/item/stack/F = new src.type( user, 1)
F.copy_evidences(src)
user.put_in_hands(F)
src.add_fingerprint(user)
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 6387a0ba305..a69d51fb969 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -48,7 +48,7 @@
flick("e_flash", M.flash)
M.eye_stat += rand(1, 3)
M.Stun(2)
- M.Weaken(10)
+ M.Weaken(5)
@@ -58,7 +58,7 @@
M.Stun(2)
M.Weaken(1)
else
- M.Stun(10)
+ M.Stun(5)
M.Weaken(3)
if ((prob(14) || (M == src.loc && prob(70))))
M.ear_damage += rand(1, 10)
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index b20f3529f92..a5f595ca94e 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -12,7 +12,7 @@
throw_range = 5
m_amt = 500
origin_tech = "materials=1"
- var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
+ var/breakouttime = 600 //Deciseconds = 120s = 2 minutes
/obj/item/weapon/handcuffs/attack(mob/living/carbon/C, mob/user)
@@ -40,7 +40,7 @@
var/turf/user_loc = user.loc
var/turf/C_loc = C.loc
- if(do_after(user, 50))
+ if(do_after(user, 40))
if(!C || C.handcuffed)
return
if(user_loc == user.loc && C_loc == C.loc)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 3ff564c590c..e576db99e45 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -196,7 +196,7 @@
var/uses = 2
/obj/item/weapon/implant/emp/New()
- activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+ activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "smile", "pale", "sniff", "whimper", "wink")
..()
return
diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm
index 0835720f32b..99d7804939f 100644
--- a/code/game/objects/items/weapons/implants/implantfreedom.dm
+++ b/code/game/objects/items/weapons/implants/implantfreedom.dm
@@ -9,8 +9,8 @@
New()
- src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
- src.uses = rand(1, 5)
+ src.activation_emote = "shrug"
+ src.uses = 4
..()
return
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index a7fa3c643f0..325e53cce16 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/code/game/objects/items/weapons/implants/implantuplink.dm
@@ -14,6 +14,7 @@
activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0)
source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate."
+ hidden_uplink.uplink_owner="[source]"
return 1
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index fa45efd81e4..30c18d353ca 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -6,32 +6,11 @@
due_date = 0 // Game time in 1/10th seconds
unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
-
-/obj/item/weapon/book/manual/engineering_construction
- name = "Station Repairs and Construction"
- icon_state ="bookEngineering"
- author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Station Repairs and Construction"
- dat = {"
-
-
-
-
-
-
-
-
-
-
- "}
-
/obj/item/weapon/book/manual/engineering_particle_accelerator
name = "Particle Accelerator User's Guide"
icon_state ="bookParticleAccelerator"
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Particle Accelerator User's Guide"
-//big pile of shit below.
-
dat = {"
"}
+BIG IMG.icon {width: 32px; height: 32px;}
+
+
+"}
\ No newline at end of file
diff --git a/sound/violin/Ab1.mid b/sound/violin/Ab1.mid
deleted file mode 100644
index 4cd7f9b55a7..00000000000
Binary files a/sound/violin/Ab1.mid and /dev/null differ
diff --git a/sound/violin/Ab2.mid b/sound/violin/Ab2.mid
deleted file mode 100644
index e827cfc635e..00000000000
Binary files a/sound/violin/Ab2.mid and /dev/null differ
diff --git a/sound/violin/Ab3.mid b/sound/violin/Ab3.mid
deleted file mode 100644
index 57e1f76c976..00000000000
Binary files a/sound/violin/Ab3.mid and /dev/null differ
diff --git a/sound/violin/Ab3.ogg b/sound/violin/Ab3.ogg
new file mode 100644
index 00000000000..f7c363aaa0c
Binary files /dev/null and b/sound/violin/Ab3.ogg differ
diff --git a/sound/violin/Ab4.mid b/sound/violin/Ab4.mid
deleted file mode 100644
index 59e95a6d997..00000000000
Binary files a/sound/violin/Ab4.mid and /dev/null differ
diff --git a/sound/violin/Ab4.ogg b/sound/violin/Ab4.ogg
new file mode 100644
index 00000000000..98a625f08f6
Binary files /dev/null and b/sound/violin/Ab4.ogg differ
diff --git a/sound/violin/Ab5.mid b/sound/violin/Ab5.mid
deleted file mode 100644
index 9bd3436287b..00000000000
Binary files a/sound/violin/Ab5.mid and /dev/null differ
diff --git a/sound/violin/Ab5.ogg b/sound/violin/Ab5.ogg
new file mode 100644
index 00000000000..57080f78f3c
Binary files /dev/null and b/sound/violin/Ab5.ogg differ
diff --git a/sound/violin/Ab6.mid b/sound/violin/Ab6.mid
deleted file mode 100644
index 3c90af807e2..00000000000
Binary files a/sound/violin/Ab6.mid and /dev/null differ
diff --git a/sound/violin/Ab6.ogg b/sound/violin/Ab6.ogg
new file mode 100644
index 00000000000..73269f81953
Binary files /dev/null and b/sound/violin/Ab6.ogg differ
diff --git a/sound/violin/Ab7.mid b/sound/violin/Ab7.mid
deleted file mode 100644
index 873d771f2ae..00000000000
Binary files a/sound/violin/Ab7.mid and /dev/null differ
diff --git a/sound/violin/Ab8.mid b/sound/violin/Ab8.mid
deleted file mode 100644
index d3f5c898d47..00000000000
Binary files a/sound/violin/Ab8.mid and /dev/null differ
diff --git a/sound/violin/An1.mid b/sound/violin/An1.mid
deleted file mode 100644
index 2f01800a075..00000000000
Binary files a/sound/violin/An1.mid and /dev/null differ
diff --git a/sound/violin/An2.mid b/sound/violin/An2.mid
deleted file mode 100644
index c8ed3cdfa6c..00000000000
Binary files a/sound/violin/An2.mid and /dev/null differ
diff --git a/sound/violin/An3.mid b/sound/violin/An3.mid
deleted file mode 100644
index e7984ca7e62..00000000000
Binary files a/sound/violin/An3.mid and /dev/null differ
diff --git a/sound/violin/An3.ogg b/sound/violin/An3.ogg
new file mode 100644
index 00000000000..7bb4c5660bd
Binary files /dev/null and b/sound/violin/An3.ogg differ
diff --git a/sound/violin/An4.mid b/sound/violin/An4.mid
deleted file mode 100644
index e1fd228f7a9..00000000000
Binary files a/sound/violin/An4.mid and /dev/null differ
diff --git a/sound/violin/An4.ogg b/sound/violin/An4.ogg
new file mode 100644
index 00000000000..835814cdf6f
Binary files /dev/null and b/sound/violin/An4.ogg differ
diff --git a/sound/violin/An5.mid b/sound/violin/An5.mid
deleted file mode 100644
index 1c8df6c98e5..00000000000
Binary files a/sound/violin/An5.mid and /dev/null differ
diff --git a/sound/violin/An5.ogg b/sound/violin/An5.ogg
new file mode 100644
index 00000000000..597b9c6d4b5
Binary files /dev/null and b/sound/violin/An5.ogg differ
diff --git a/sound/violin/An6.mid b/sound/violin/An6.mid
deleted file mode 100644
index 2784428daf9..00000000000
Binary files a/sound/violin/An6.mid and /dev/null differ
diff --git a/sound/violin/An6.ogg b/sound/violin/An6.ogg
new file mode 100644
index 00000000000..4d6e8c20d68
Binary files /dev/null and b/sound/violin/An6.ogg differ
diff --git a/sound/violin/An7.mid b/sound/violin/An7.mid
deleted file mode 100644
index 2db2ab70a7d..00000000000
Binary files a/sound/violin/An7.mid and /dev/null differ
diff --git a/sound/violin/An8.mid b/sound/violin/An8.mid
deleted file mode 100644
index 693f7c1d63e..00000000000
Binary files a/sound/violin/An8.mid and /dev/null differ
diff --git a/sound/violin/Bb1.mid b/sound/violin/Bb1.mid
deleted file mode 100644
index 40da5f3da15..00000000000
Binary files a/sound/violin/Bb1.mid and /dev/null differ
diff --git a/sound/violin/Bb2.mid b/sound/violin/Bb2.mid
deleted file mode 100644
index 5bab6ccd636..00000000000
Binary files a/sound/violin/Bb2.mid and /dev/null differ
diff --git a/sound/violin/Bb3.mid b/sound/violin/Bb3.mid
deleted file mode 100644
index dce830448ef..00000000000
Binary files a/sound/violin/Bb3.mid and /dev/null differ
diff --git a/sound/violin/Bb3.ogg b/sound/violin/Bb3.ogg
new file mode 100644
index 00000000000..2d241e72487
Binary files /dev/null and b/sound/violin/Bb3.ogg differ
diff --git a/sound/violin/Bb4.mid b/sound/violin/Bb4.mid
deleted file mode 100644
index fda796e27b9..00000000000
Binary files a/sound/violin/Bb4.mid and /dev/null differ
diff --git a/sound/violin/Bb4.ogg b/sound/violin/Bb4.ogg
new file mode 100644
index 00000000000..5b9601be4ef
Binary files /dev/null and b/sound/violin/Bb4.ogg differ
diff --git a/sound/violin/Bb5.mid b/sound/violin/Bb5.mid
deleted file mode 100644
index 9e5da684f43..00000000000
Binary files a/sound/violin/Bb5.mid and /dev/null differ
diff --git a/sound/violin/Bb5.ogg b/sound/violin/Bb5.ogg
new file mode 100644
index 00000000000..107ecd8ef97
Binary files /dev/null and b/sound/violin/Bb5.ogg differ
diff --git a/sound/violin/Bb6.mid b/sound/violin/Bb6.mid
deleted file mode 100644
index 215c56cbe7e..00000000000
Binary files a/sound/violin/Bb6.mid and /dev/null differ
diff --git a/sound/violin/Bb6.ogg b/sound/violin/Bb6.ogg
new file mode 100644
index 00000000000..d885b33c936
Binary files /dev/null and b/sound/violin/Bb6.ogg differ
diff --git a/sound/violin/Bb7.mid b/sound/violin/Bb7.mid
deleted file mode 100644
index 4b55c34691f..00000000000
Binary files a/sound/violin/Bb7.mid and /dev/null differ
diff --git a/sound/violin/Bb8.mid b/sound/violin/Bb8.mid
deleted file mode 100644
index a422f768f63..00000000000
Binary files a/sound/violin/Bb8.mid and /dev/null differ
diff --git a/sound/violin/Bn1.mid b/sound/violin/Bn1.mid
deleted file mode 100644
index 54c9b99d03f..00000000000
Binary files a/sound/violin/Bn1.mid and /dev/null differ
diff --git a/sound/violin/Bn2.mid b/sound/violin/Bn2.mid
deleted file mode 100644
index f73476fb7bb..00000000000
Binary files a/sound/violin/Bn2.mid and /dev/null differ
diff --git a/sound/violin/Bn3.mid b/sound/violin/Bn3.mid
deleted file mode 100644
index 2aa30708a6c..00000000000
Binary files a/sound/violin/Bn3.mid and /dev/null differ
diff --git a/sound/violin/Bn3.ogg b/sound/violin/Bn3.ogg
new file mode 100644
index 00000000000..774e1f00ba5
Binary files /dev/null and b/sound/violin/Bn3.ogg differ
diff --git a/sound/violin/Bn4.mid b/sound/violin/Bn4.mid
deleted file mode 100644
index 0ebe636b714..00000000000
Binary files a/sound/violin/Bn4.mid and /dev/null differ
diff --git a/sound/violin/Bn4.ogg b/sound/violin/Bn4.ogg
new file mode 100644
index 00000000000..4af7c856b86
Binary files /dev/null and b/sound/violin/Bn4.ogg differ
diff --git a/sound/violin/Bn5.mid b/sound/violin/Bn5.mid
deleted file mode 100644
index 3b8e1c217f7..00000000000
Binary files a/sound/violin/Bn5.mid and /dev/null differ
diff --git a/sound/violin/Bn5.ogg b/sound/violin/Bn5.ogg
new file mode 100644
index 00000000000..5ea770e39c9
Binary files /dev/null and b/sound/violin/Bn5.ogg differ
diff --git a/sound/violin/Bn6.mid b/sound/violin/Bn6.mid
deleted file mode 100644
index afcb1982a13..00000000000
Binary files a/sound/violin/Bn6.mid and /dev/null differ
diff --git a/sound/violin/Bn6.ogg b/sound/violin/Bn6.ogg
new file mode 100644
index 00000000000..021159bda2f
Binary files /dev/null and b/sound/violin/Bn6.ogg differ
diff --git a/sound/violin/Bn7.mid b/sound/violin/Bn7.mid
deleted file mode 100644
index 3afd469256c..00000000000
Binary files a/sound/violin/Bn7.mid and /dev/null differ
diff --git a/sound/violin/Bn8.mid b/sound/violin/Bn8.mid
deleted file mode 100644
index 30488f2505a..00000000000
Binary files a/sound/violin/Bn8.mid and /dev/null differ
diff --git a/sound/violin/Cn1.mid b/sound/violin/Cn1.mid
deleted file mode 100644
index 857120f31f4..00000000000
Binary files a/sound/violin/Cn1.mid and /dev/null differ
diff --git a/sound/violin/Cn2.mid b/sound/violin/Cn2.mid
deleted file mode 100644
index 3ccd6670e87..00000000000
Binary files a/sound/violin/Cn2.mid and /dev/null differ
diff --git a/sound/violin/Cn3.mid b/sound/violin/Cn3.mid
deleted file mode 100644
index 1851e4f8d27..00000000000
Binary files a/sound/violin/Cn3.mid and /dev/null differ
diff --git a/sound/violin/Cn4.mid b/sound/violin/Cn4.mid
deleted file mode 100644
index 65e8b0efe4e..00000000000
Binary files a/sound/violin/Cn4.mid and /dev/null differ
diff --git a/sound/violin/Cn4.ogg b/sound/violin/Cn4.ogg
new file mode 100644
index 00000000000..65f084ee543
Binary files /dev/null and b/sound/violin/Cn4.ogg differ
diff --git a/sound/violin/Cn5.mid b/sound/violin/Cn5.mid
deleted file mode 100644
index 544f921e43b..00000000000
Binary files a/sound/violin/Cn5.mid and /dev/null differ
diff --git a/sound/violin/Cn5.ogg b/sound/violin/Cn5.ogg
new file mode 100644
index 00000000000..696a681d02a
Binary files /dev/null and b/sound/violin/Cn5.ogg differ
diff --git a/sound/violin/Cn6.mid b/sound/violin/Cn6.mid
deleted file mode 100644
index 7c78dab2f07..00000000000
Binary files a/sound/violin/Cn6.mid and /dev/null differ
diff --git a/sound/violin/Cn6.ogg b/sound/violin/Cn6.ogg
new file mode 100644
index 00000000000..3e65c072692
Binary files /dev/null and b/sound/violin/Cn6.ogg differ
diff --git a/sound/violin/Cn7.mid b/sound/violin/Cn7.mid
deleted file mode 100644
index 3abe4cde086..00000000000
Binary files a/sound/violin/Cn7.mid and /dev/null differ
diff --git a/sound/violin/Cn7.ogg b/sound/violin/Cn7.ogg
new file mode 100644
index 00000000000..7c66a1cde5d
Binary files /dev/null and b/sound/violin/Cn7.ogg differ
diff --git a/sound/violin/Cn8.mid b/sound/violin/Cn8.mid
deleted file mode 100644
index 06f14081b3b..00000000000
Binary files a/sound/violin/Cn8.mid and /dev/null differ
diff --git a/sound/violin/Cn9.mid b/sound/violin/Cn9.mid
deleted file mode 100644
index 62f4eef045a..00000000000
Binary files a/sound/violin/Cn9.mid and /dev/null differ
diff --git a/sound/violin/Db1.mid b/sound/violin/Db1.mid
deleted file mode 100644
index 88dba851452..00000000000
Binary files a/sound/violin/Db1.mid and /dev/null differ
diff --git a/sound/violin/Db2.mid b/sound/violin/Db2.mid
deleted file mode 100644
index b510926b45f..00000000000
Binary files a/sound/violin/Db2.mid and /dev/null differ
diff --git a/sound/violin/Db3.mid b/sound/violin/Db3.mid
deleted file mode 100644
index 9954bbe478a..00000000000
Binary files a/sound/violin/Db3.mid and /dev/null differ
diff --git a/sound/violin/Db4.mid b/sound/violin/Db4.mid
deleted file mode 100644
index 2c5ff74db0a..00000000000
Binary files a/sound/violin/Db4.mid and /dev/null differ
diff --git a/sound/violin/Db4.ogg b/sound/violin/Db4.ogg
new file mode 100644
index 00000000000..a43b0864bd7
Binary files /dev/null and b/sound/violin/Db4.ogg differ
diff --git a/sound/violin/Db5.mid b/sound/violin/Db5.mid
deleted file mode 100644
index e5850a3fd04..00000000000
Binary files a/sound/violin/Db5.mid and /dev/null differ
diff --git a/sound/violin/Db5.ogg b/sound/violin/Db5.ogg
new file mode 100644
index 00000000000..87c70c5bbae
Binary files /dev/null and b/sound/violin/Db5.ogg differ
diff --git a/sound/violin/Db6.mid b/sound/violin/Db6.mid
deleted file mode 100644
index 217c0ad014c..00000000000
Binary files a/sound/violin/Db6.mid and /dev/null differ
diff --git a/sound/violin/Db6.ogg b/sound/violin/Db6.ogg
new file mode 100644
index 00000000000..efba7d70d7f
Binary files /dev/null and b/sound/violin/Db6.ogg differ
diff --git a/sound/violin/Db7.mid b/sound/violin/Db7.mid
deleted file mode 100644
index ec32bdbf904..00000000000
Binary files a/sound/violin/Db7.mid and /dev/null differ
diff --git a/sound/violin/Db7.ogg b/sound/violin/Db7.ogg
new file mode 100644
index 00000000000..72dd970510c
Binary files /dev/null and b/sound/violin/Db7.ogg differ
diff --git a/sound/violin/Db8.mid b/sound/violin/Db8.mid
deleted file mode 100644
index 555bce3db0d..00000000000
Binary files a/sound/violin/Db8.mid and /dev/null differ
diff --git a/sound/violin/Dn1.mid b/sound/violin/Dn1.mid
deleted file mode 100644
index 92e4e0d9581..00000000000
Binary files a/sound/violin/Dn1.mid and /dev/null differ
diff --git a/sound/violin/Dn2.mid b/sound/violin/Dn2.mid
deleted file mode 100644
index 34eb9d1db1b..00000000000
Binary files a/sound/violin/Dn2.mid and /dev/null differ
diff --git a/sound/violin/Dn3.mid b/sound/violin/Dn3.mid
deleted file mode 100644
index fbd56085aaf..00000000000
Binary files a/sound/violin/Dn3.mid and /dev/null differ
diff --git a/sound/violin/Dn4.mid b/sound/violin/Dn4.mid
deleted file mode 100644
index e13c7448292..00000000000
Binary files a/sound/violin/Dn4.mid and /dev/null differ
diff --git a/sound/violin/Dn4.ogg b/sound/violin/Dn4.ogg
new file mode 100644
index 00000000000..effc1bee937
Binary files /dev/null and b/sound/violin/Dn4.ogg differ
diff --git a/sound/violin/Dn5.mid b/sound/violin/Dn5.mid
deleted file mode 100644
index 8fd41e5c6fe..00000000000
Binary files a/sound/violin/Dn5.mid and /dev/null differ
diff --git a/sound/violin/Dn5.ogg b/sound/violin/Dn5.ogg
new file mode 100644
index 00000000000..d696c2e3df8
Binary files /dev/null and b/sound/violin/Dn5.ogg differ
diff --git a/sound/violin/Dn6.mid b/sound/violin/Dn6.mid
deleted file mode 100644
index d47329e8f9e..00000000000
Binary files a/sound/violin/Dn6.mid and /dev/null differ
diff --git a/sound/violin/Dn6.ogg b/sound/violin/Dn6.ogg
new file mode 100644
index 00000000000..60de91af21b
Binary files /dev/null and b/sound/violin/Dn6.ogg differ
diff --git a/sound/violin/Dn7.mid b/sound/violin/Dn7.mid
deleted file mode 100644
index b2496603876..00000000000
Binary files a/sound/violin/Dn7.mid and /dev/null differ
diff --git a/sound/violin/Dn7.ogg b/sound/violin/Dn7.ogg
new file mode 100644
index 00000000000..aed1d957cfc
Binary files /dev/null and b/sound/violin/Dn7.ogg differ
diff --git a/sound/violin/Dn8.mid b/sound/violin/Dn8.mid
deleted file mode 100644
index 56667a1a86d..00000000000
Binary files a/sound/violin/Dn8.mid and /dev/null differ
diff --git a/sound/violin/Eb1.mid b/sound/violin/Eb1.mid
deleted file mode 100644
index 829e6fcf185..00000000000
Binary files a/sound/violin/Eb1.mid and /dev/null differ
diff --git a/sound/violin/Eb2.mid b/sound/violin/Eb2.mid
deleted file mode 100644
index 66029b340cc..00000000000
Binary files a/sound/violin/Eb2.mid and /dev/null differ
diff --git a/sound/violin/Eb3.mid b/sound/violin/Eb3.mid
deleted file mode 100644
index c982375941e..00000000000
Binary files a/sound/violin/Eb3.mid and /dev/null differ
diff --git a/sound/violin/Eb4.mid b/sound/violin/Eb4.mid
deleted file mode 100644
index 016ed4f1edf..00000000000
Binary files a/sound/violin/Eb4.mid and /dev/null differ
diff --git a/sound/violin/Eb4.ogg b/sound/violin/Eb4.ogg
new file mode 100644
index 00000000000..d8d080e7fca
Binary files /dev/null and b/sound/violin/Eb4.ogg differ
diff --git a/sound/violin/Eb5.mid b/sound/violin/Eb5.mid
deleted file mode 100644
index ddb511795df..00000000000
Binary files a/sound/violin/Eb5.mid and /dev/null differ
diff --git a/sound/violin/Eb5.ogg b/sound/violin/Eb5.ogg
new file mode 100644
index 00000000000..c1988dfa4e7
Binary files /dev/null and b/sound/violin/Eb5.ogg differ
diff --git a/sound/violin/Eb6.mid b/sound/violin/Eb6.mid
deleted file mode 100644
index b7242b9ab99..00000000000
Binary files a/sound/violin/Eb6.mid and /dev/null differ
diff --git a/sound/violin/Eb6.ogg b/sound/violin/Eb6.ogg
new file mode 100644
index 00000000000..822f90e112a
Binary files /dev/null and b/sound/violin/Eb6.ogg differ
diff --git a/sound/violin/Eb7.mid b/sound/violin/Eb7.mid
deleted file mode 100644
index 773538340a5..00000000000
Binary files a/sound/violin/Eb7.mid and /dev/null differ
diff --git a/sound/violin/Eb8.mid b/sound/violin/Eb8.mid
deleted file mode 100644
index 4ad074e173b..00000000000
Binary files a/sound/violin/Eb8.mid and /dev/null differ
diff --git a/sound/violin/En1.mid b/sound/violin/En1.mid
deleted file mode 100644
index 79ab68df9df..00000000000
Binary files a/sound/violin/En1.mid and /dev/null differ
diff --git a/sound/violin/En2.mid b/sound/violin/En2.mid
deleted file mode 100644
index cd61c8d0de5..00000000000
Binary files a/sound/violin/En2.mid and /dev/null differ
diff --git a/sound/violin/En3.mid b/sound/violin/En3.mid
deleted file mode 100644
index da5b703d545..00000000000
Binary files a/sound/violin/En3.mid and /dev/null differ
diff --git a/sound/violin/En4.mid b/sound/violin/En4.mid
deleted file mode 100644
index f7d3af024ff..00000000000
Binary files a/sound/violin/En4.mid and /dev/null differ
diff --git a/sound/violin/En4.ogg b/sound/violin/En4.ogg
new file mode 100644
index 00000000000..7e104582272
Binary files /dev/null and b/sound/violin/En4.ogg differ
diff --git a/sound/violin/En5.mid b/sound/violin/En5.mid
deleted file mode 100644
index d3d353943f9..00000000000
Binary files a/sound/violin/En5.mid and /dev/null differ
diff --git a/sound/violin/En5.ogg b/sound/violin/En5.ogg
new file mode 100644
index 00000000000..8666eb7ae7d
Binary files /dev/null and b/sound/violin/En5.ogg differ
diff --git a/sound/violin/En6.mid b/sound/violin/En6.mid
deleted file mode 100644
index 73eb5b0697d..00000000000
Binary files a/sound/violin/En6.mid and /dev/null differ
diff --git a/sound/violin/En6.ogg b/sound/violin/En6.ogg
new file mode 100644
index 00000000000..4028aa60120
Binary files /dev/null and b/sound/violin/En6.ogg differ
diff --git a/sound/violin/En7.mid b/sound/violin/En7.mid
deleted file mode 100644
index 79a9462c844..00000000000
Binary files a/sound/violin/En7.mid and /dev/null differ
diff --git a/sound/violin/En8.mid b/sound/violin/En8.mid
deleted file mode 100644
index 88947fc7318..00000000000
Binary files a/sound/violin/En8.mid and /dev/null differ
diff --git a/sound/violin/Fn1.mid b/sound/violin/Fn1.mid
deleted file mode 100644
index abe0d4e4051..00000000000
Binary files a/sound/violin/Fn1.mid and /dev/null differ
diff --git a/sound/violin/Fn2.mid b/sound/violin/Fn2.mid
deleted file mode 100644
index d245bef3b54..00000000000
Binary files a/sound/violin/Fn2.mid and /dev/null differ
diff --git a/sound/violin/Fn3.mid b/sound/violin/Fn3.mid
deleted file mode 100644
index e532e30dac9..00000000000
Binary files a/sound/violin/Fn3.mid and /dev/null differ
diff --git a/sound/violin/Fn4.mid b/sound/violin/Fn4.mid
deleted file mode 100644
index 47219c72fa2..00000000000
Binary files a/sound/violin/Fn4.mid and /dev/null differ
diff --git a/sound/violin/Fn4.ogg b/sound/violin/Fn4.ogg
new file mode 100644
index 00000000000..e86c3569390
Binary files /dev/null and b/sound/violin/Fn4.ogg differ
diff --git a/sound/violin/Fn5.mid b/sound/violin/Fn5.mid
deleted file mode 100644
index 630d16371d9..00000000000
Binary files a/sound/violin/Fn5.mid and /dev/null differ
diff --git a/sound/violin/Fn5.ogg b/sound/violin/Fn5.ogg
new file mode 100644
index 00000000000..702a61afe95
Binary files /dev/null and b/sound/violin/Fn5.ogg differ
diff --git a/sound/violin/Fn6.mid b/sound/violin/Fn6.mid
deleted file mode 100644
index 08cbc981bdb..00000000000
Binary files a/sound/violin/Fn6.mid and /dev/null differ
diff --git a/sound/violin/Fn6.ogg b/sound/violin/Fn6.ogg
new file mode 100644
index 00000000000..a724b4fe9c3
Binary files /dev/null and b/sound/violin/Fn6.ogg differ
diff --git a/sound/violin/Fn7.mid b/sound/violin/Fn7.mid
deleted file mode 100644
index 6c28c7d272e..00000000000
Binary files a/sound/violin/Fn7.mid and /dev/null differ
diff --git a/sound/violin/Fn8.mid b/sound/violin/Fn8.mid
deleted file mode 100644
index 2d73762f269..00000000000
Binary files a/sound/violin/Fn8.mid and /dev/null differ
diff --git a/sound/violin/Gb1.mid b/sound/violin/Gb1.mid
deleted file mode 100644
index d18668e8911..00000000000
Binary files a/sound/violin/Gb1.mid and /dev/null differ
diff --git a/sound/violin/Gb2.mid b/sound/violin/Gb2.mid
deleted file mode 100644
index 302f0c6fdc1..00000000000
Binary files a/sound/violin/Gb2.mid and /dev/null differ
diff --git a/sound/violin/Gb3.mid b/sound/violin/Gb3.mid
deleted file mode 100644
index 1f592fc9039..00000000000
Binary files a/sound/violin/Gb3.mid and /dev/null differ
diff --git a/sound/violin/Gb4.mid b/sound/violin/Gb4.mid
deleted file mode 100644
index 45854126f98..00000000000
Binary files a/sound/violin/Gb4.mid and /dev/null differ
diff --git a/sound/violin/Gb4.ogg b/sound/violin/Gb4.ogg
new file mode 100644
index 00000000000..08469ece6a5
Binary files /dev/null and b/sound/violin/Gb4.ogg differ
diff --git a/sound/violin/Gb5.mid b/sound/violin/Gb5.mid
deleted file mode 100644
index fb1e1da339a..00000000000
Binary files a/sound/violin/Gb5.mid and /dev/null differ
diff --git a/sound/violin/Gb5.ogg b/sound/violin/Gb5.ogg
new file mode 100644
index 00000000000..04f70871613
Binary files /dev/null and b/sound/violin/Gb5.ogg differ
diff --git a/sound/violin/Gb6.mid b/sound/violin/Gb6.mid
deleted file mode 100644
index bfa896bb784..00000000000
Binary files a/sound/violin/Gb6.mid and /dev/null differ
diff --git a/sound/violin/Gb6.ogg b/sound/violin/Gb6.ogg
new file mode 100644
index 00000000000..1cdf4e50dc3
Binary files /dev/null and b/sound/violin/Gb6.ogg differ
diff --git a/sound/violin/Gb7.mid b/sound/violin/Gb7.mid
deleted file mode 100644
index a27763c1d47..00000000000
Binary files a/sound/violin/Gb7.mid and /dev/null differ
diff --git a/sound/violin/Gb8.mid b/sound/violin/Gb8.mid
deleted file mode 100644
index aaab80a7276..00000000000
Binary files a/sound/violin/Gb8.mid and /dev/null differ
diff --git a/sound/violin/Gn1.mid b/sound/violin/Gn1.mid
deleted file mode 100644
index 1df52ab0760..00000000000
Binary files a/sound/violin/Gn1.mid and /dev/null differ
diff --git a/sound/violin/Gn2.mid b/sound/violin/Gn2.mid
deleted file mode 100644
index 6e0ca383127..00000000000
Binary files a/sound/violin/Gn2.mid and /dev/null differ
diff --git a/sound/violin/Gn3.mid b/sound/violin/Gn3.mid
deleted file mode 100644
index bb3e6dedcbf..00000000000
Binary files a/sound/violin/Gn3.mid and /dev/null differ
diff --git a/sound/violin/Gn3.ogg b/sound/violin/Gn3.ogg
new file mode 100644
index 00000000000..8f48fe3390b
Binary files /dev/null and b/sound/violin/Gn3.ogg differ
diff --git a/sound/violin/Gn4.mid b/sound/violin/Gn4.mid
deleted file mode 100644
index 0c46432afee..00000000000
Binary files a/sound/violin/Gn4.mid and /dev/null differ
diff --git a/sound/violin/Gn4.ogg b/sound/violin/Gn4.ogg
new file mode 100644
index 00000000000..0d997d5b3c0
Binary files /dev/null and b/sound/violin/Gn4.ogg differ
diff --git a/sound/violin/Gn5.mid b/sound/violin/Gn5.mid
deleted file mode 100644
index f39dcf5e2b9..00000000000
Binary files a/sound/violin/Gn5.mid and /dev/null differ
diff --git a/sound/violin/Gn5.ogg b/sound/violin/Gn5.ogg
new file mode 100644
index 00000000000..b597e197615
Binary files /dev/null and b/sound/violin/Gn5.ogg differ
diff --git a/sound/violin/Gn6.mid b/sound/violin/Gn6.mid
deleted file mode 100644
index 0efa2259ca1..00000000000
Binary files a/sound/violin/Gn6.mid and /dev/null differ
diff --git a/sound/violin/Gn6.ogg b/sound/violin/Gn6.ogg
new file mode 100644
index 00000000000..43826d080bb
Binary files /dev/null and b/sound/violin/Gn6.ogg differ
diff --git a/sound/violin/Gn7.mid b/sound/violin/Gn7.mid
deleted file mode 100644
index 22fd1b6bcb0..00000000000
Binary files a/sound/violin/Gn7.mid and /dev/null differ
diff --git a/sound/violin/Gn8.mid b/sound/violin/Gn8.mid
deleted file mode 100644
index 16b7171d627..00000000000
Binary files a/sound/violin/Gn8.mid and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index f72cc5d5ec9..7500246843c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -117,6 +117,7 @@
#include "code\datums\datacore.dm"
#include "code\datums\datumvars.dm"
#include "code\datums\disease.dm"
+#include "code\datums\gas_mixture.dm"
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
#include "code\datums\modules.dm"
@@ -197,6 +198,7 @@
#include "code\datums\wires\airlock.dm"
#include "code\datums\wires\alarm.dm"
#include "code\datums\wires\apc.dm"
+#include "code\datums\wires\autolathe.dm"
#include "code\datums\wires\camera.dm"
#include "code\datums\wires\explosive.dm"
#include "code\datums\wires\mulebot.dm"
@@ -214,7 +216,6 @@
#include "code\defines\procs\command_alert.dm"
#include "code\defines\procs\dbcore.dm"
#include "code\defines\procs\statistics.dm"
-#include "code\FEA\FEA_gas_mixture.dm"
#include "code\game\asteroid.dm"
#include "code\game\atoms.dm"
#include "code\game\atoms_movable.dm"
@@ -305,7 +306,6 @@
#include "code\game\machinery\deployable.dm"
#include "code\game\machinery\door_control.dm"
#include "code\game\machinery\doppler_array.dm"
-#include "code\game\machinery\drying_rack.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\Freezer.dm"
#include "code\game\machinery\hologram.dm"