diff --git a/code/game/machinery/kitchen/deep_fryer.dm b/code/game/machinery/kitchen/deep_fryer.dm
index d75c7e54..fc52da11 100644
--- a/code/game/machinery/kitchen/deep_fryer.dm
+++ b/code/game/machinery/kitchen/deep_fryer.dm
@@ -22,29 +22,26 @@
if(istype(G)) // handle grabbed mob
if(ismob(G.affecting))
var/mob/living/GM = G.affecting
- for (var/mob/V in viewers(usr))
- V.show_message("[usr] starts pushing [GM.name] into the fryer.", 3)
+// for (var/mob/V in viewers(usr))
+// V.show_message("[usr] starts pushing [GM.name] into the fryer.", 3)
+ user.visible_message("[user] starts pushing [GM.name] into the fryer.", "You try to force [src] towards the fryer.", "You hear a struggle.")
if(do_after(usr, 20))
var/body_part = fry_mob_by_limb(GM, user.zone_sel.selecting)
if(!body_part) //If you fry a valid part this will be set
- for (var/mob/V in viewers(usr))
- if(GM.sleeping||GM.resting)
- V.show_message("[GM.name] is to much of a dead weight to be place in the fryer")
- else
- V.show_message("[GM.name] breaks free.", 3)
+ if(GM.sleeping||GM.resting)
+ user.visible_message("[GM.name] falls limp.", "[GM.name] is to much of a dead weight to be place in the fryer", "You hear a thump.")
+ else
+ GM.visible_message("[GM.name] breaks free.", "You broke free from [user]'s grip", "You stop hearing a struggle.")
return
- for (var/mob/C in viewers(src))
- C.show_message("\red [GM.name]'s [body_part] has been placed in the [src] by [user].", 3)
-
+ user.visible_message("[GM.name]'s [body_part] has been placed in the [src] by [user]", "You place [GM.name]'s [body_part] in the fryer", "You hear a sizzling.")
del(G)
usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in in the fryer.")
GM.attack_log += text("\[[time_stamp()]\] Has been fried by [usr.name] ([usr.ckey])")
msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a fryer. (JMP)")
else
- for (var/mob/V in viewers(usr))
- V.show_message("[usr] broke free")
+ GM.visible_message("[GM.name] breaks free.", "You broke free from [user]'s grip", "You stop hearing a struggle.")
return
else
@@ -65,42 +62,51 @@
if("head")
M.apply_damage(40, BURN, limb)
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your head."
+ M.say("*scream")
return "head"
if("l_leg")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "l_foot")
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your left leg and foot."
+ M.say("*scream")
return "left leg"
if("l_foot")
M.apply_damage(20, BURN, limb)
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your left foot."
+ M.say("*scream")
return "left foot"
if("r_leg")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "r_foot")
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your right leg and foot."
+ M.say("*scream")
return "right leg"
if("r_foot")
M.apply_damage(20, BURN, limb)
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your right foot."
+ M.say("*scream")
return "right foot"
if("l_arm")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "l_hand")
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your left arm and hand."
+ M.say("*scream")
return "left arm"
if("l_hand")
M.apply_damage(20, BURN, limb)
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your left hand."
+ M.say("*scream")
return "left hand"
if("r_arm")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "r_hand")
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your right arm and hand."
+ M.say("*scream")
return "right arm"
if("r_hand")
M.apply_damage(20, BURN, limb)
M << "\red Your thoughts are overwritten by the pain, as searing hot oil encompasses your right hand."
+ M.say("*scream")
return "right hand"
return null
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 723f7726..08321d8b 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -430,9 +430,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = icon_off
item_state = icon_off
if(istype(src, /obj/item/weapon/lighter/zippo) )
- user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
+ user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
else
- user.visible_message("[user] quietly shuts off the [src].")
+ user.visible_message("[user] quietly shuts off the [src].")
user.SetLuminosity(user.luminosity - 2)
processing_objects.Remove(src)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 5aea9ff6..7ff400b8 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -61,10 +61,10 @@
attack_self()
..()
if (is_open_container())
- usr << "You put the lid on \the [src]."
+ usr << "You put the lid on \the [src]."
flags ^= OPENCONTAINER
else
- usr << "You take the lid off \the [src]."
+ usr << "You take the lid off \the [src]."
flags |= OPENCONTAINER
update_icon()
@@ -280,7 +280,7 @@
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.drop_from_inventory(src)
del(src)
-
+
update_icon()
overlays.Cut()
diff --git a/html/changelog.html b/html/changelog.html
index 86ebfd3e..1509774c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,9 +62,11 @@ should be listed in the changelog upon commit though. Thanks. -->
- AI's can contact CentComm once every half an hour
- Cancel button on kitchen equipment
+ - Messages when frying people
- You can no longer turn everything into candy
- You can no longer put everything in the oven
- You can no longer put everything in the grill
+ - HTML Log tags