diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index f8c97dbaa7d..189b9be4b61 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -135,6 +135,12 @@
..()
+/datum/brain_trauma/mild/concussion/on_lose()
+ owner.dizziness = 0
+ owner.slurring = 0
+ owner.confused = 0
+ ..()
+
/datum/brain_trauma/mild/muscle_weakness
name = "Muscle Weakness"
desc = "Patient experiences occasional bouts of muscle weakness."
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 29efd4d2add..a4bf42bc22f 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -62,7 +62,7 @@
if(P.iswirecutter())
playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1)
to_chat(user, span("notice", "You decide to scrap the blueprint."))
- new /obj/item/stack/material/steel(src.loc, 5)
+ new /obj/item/stack/material/steel(src.loc, 2)
qdel(src)
if(2)
if(P.iscoil())
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 975e58dba34..e62d8b10ebe 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -55,7 +55,7 @@
/obj/item/clothing/shoes/science
name = "scientist shoes"
desc = "A pair of treated purple and white shoes resistant to chemical and gas spills."
- icon_state = "scientist"
+ icon_state = "science"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm
index e71530cf21b..f2c361d7ed6 100644
--- a/code/modules/mob/living/carbon/breathe.dm
+++ b/code/modules/mob/living/carbon/breathe.dm
@@ -32,7 +32,7 @@
if(losebreath>0) //Suffocating so do not take a breath
losebreath--
- if (prob(10)) //Gasp per 10 ticks? Sounds about right.
+ if (prob(10) && !isipc(src)) //Gasp per 10 ticks? Sounds about right.
spawn emote("gasp")
else
//Okay, we can breathe, now check if we can get air
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 0fbaaa7b0c5..e10da11640f 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -172,7 +172,7 @@
switch(target_zone)
if("mouth")
if(announce)
- user.visible_message("\The [user] covers [target]'s mouth!")
+ user.visible_message("\The [user] covers [target]'s face!")
if(target.silent < 3)
target.silent = 3
if("eyes")
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index cd181ecfc2f..355ee386b58 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -318,8 +318,6 @@
var/obj/item/weapon/weldingtool/F = P
if (!F.welding)//welding tools are 0 when off
return
- if (!F.remove_fuel(1, user))//This function removes the fuel and does the usual eyedamage checks, if it returns 0 then the welder is out of fuel and cant burn paper
- return
else
//If we got here somehow, the item is incompatible and can't burn things
return
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 24f2f664de2..5e5cbb04cb2 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -192,10 +192,10 @@
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
if(Proj.get_structure_damage())
if(istype(Proj.firer))
- message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).")
+ log_and_message_admins("shot a welding tank", Proj.firer)
log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).",ckey=key_name(Proj.firer))
- if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
+ if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) && !istype(Proj ,/obj/item/projectile/kinetic))
ex_act(2.0)
/obj/structure/reagent_dispensers/fueltank/ex_act(var/severity = 3.0)
diff --git a/html/changelogs/sepbugfix179.yml b/html/changelogs/sepbugfix179.yml
new file mode 100644
index 00000000000..41db2f638f2
--- /dev/null
+++ b/html/changelogs/sepbugfix179.yml
@@ -0,0 +1,46 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Lady Fowl
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "KA Blasts no longer blow up welder tanks."
+ - bugfix: "Science shoe sprites are visible now."
+ - bugfix: "IPC'S can no longer be silenced or gasp when choking."
+ - bugfix: "Fixing concussions now removes slurring and confusion."
+ - bugfix: "Burning paper no longer burns you're eyes with a welding tool."
+ - bugfix: "Fix's machine deconstruction bug."
\ No newline at end of file
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 88492503d72..a479743b28f 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ