diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 8566e04ff24..a0a5bfdc6e2 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -43,7 +43,7 @@
stage = 2
else
user << "\red You need to add at least one beaker before locking the assembly."
- else if (istype(W,/obj/item/weapon/reagent_containers/glass) && stage == 1)
+ else if (istype(W,/obj/item/weapon/reagent_containers/glass/beaker) && stage == 1)
if(beakers.len == 2)
user << "\red The grenade can not hold more containers."
return
@@ -788,11 +788,11 @@
M << "\blue You take a bite of [src]."
if (fullness > 350 && fullness <= 550)
M << "\blue You unwillingly chew a bit of [src]."
- if (fullness > (550 * (1 + M.overeatduration / 1000))) // The more he eats - the more he can eat
+ if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
M << "\red You cannot force any more of [src] to go down your throat."
return 0
else //If you're feeding it to someone else.
- var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 10)
+ var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if (fullness <= (550 * (1 + M.overeatduration / 1000)))
for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] attempts to feed [M] [src].", 1)
@@ -1036,6 +1036,7 @@
item_state = "bucket"
m_amt = 200
g_amt = 0
+ w_class = 3.0
amount_per_transfer_from_this = 20
flags = FPRINT | OPENCONTAINER
@@ -1067,7 +1068,7 @@
item_state = "canister"
m_amt = 300
g_amt = 0
- w_class = 5.0
+ w_class = 4.0
amount_per_transfer_from_this = 20
flags = FPRINT
diff --git a/code/game/gamemodes/wizard/spell12.dm b/code/game/gamemodes/wizard/spell12.dm
index 6f107728dce..6f6aaaa1b5f 100644
--- a/code/game/gamemodes/wizard/spell12.dm
+++ b/code/game/gamemodes/wizard/spell12.dm
@@ -5,8 +5,6 @@
if(!usr.casting()) return
var/A
usr.verbs -= /mob/proc/teleport
- spawn(450)
- usr.verbs += /mob/proc/teleport
var/list/theareas = new/list()
for(var/area/AR in world)
@@ -18,6 +16,11 @@
theareas[AR.name] = AR
A = input("Area to jump to", "BOOYEA", A) in theareas
+
+ spawn(450)
+ usr.verbs += /mob/proc/teleport
+
+
var/area/thearea = theareas[A]
usr.say("SCYAR NILA [uppertext(A)]")
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 9f122de37f2..4cf761ebf69 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -44,7 +44,7 @@
if (!conf_access || !conf_access.len || !(acc in conf_access))
t1 += "[aname]
"
else
- t1 += "[aname]
"
+ t1 += "[aname]
"
t1 += text("