diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 8c2d6ac0f29..d06179160eb 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -99,5 +99,5 @@
#define FLAMMABLE 0
#define ON_FIRE 1
-//resistant_flags
+//resistance_flags
#define INDESTRUCTIBLE 64 //doesn't take damage
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index b448fc98759..58b12ed8857 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -132,7 +132,7 @@
var/message_hit_area = ""
if(hit_area)
message_hit_area = " in the [hit_area]"
- var/attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!"
+ var/attack_message = "[src] has been [message_verb][message_hit_area] with [I]."
if(user in viewers(src, null))
attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!"
visible_message("[attack_message]",\
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 56471829a00..23b0fd62305 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -824,7 +824,7 @@ About the new airlock wires panel:
return
to_chat(user, "You begin cutting the panel's shielding...")
playsound(loc, WT.usesound, 40, 1)
- if(do_after(user, 40*WT.toolspeed, 1, target = src))
+ if(do_after(user, 40 * WT.toolspeed, 1, target = src))
if(!panel_open || !WT.isOn())
return
playsound(loc, WT.usesound, 50, 1)
@@ -840,7 +840,7 @@ About the new airlock wires panel:
var/obj/item/weapon/crowbar/W = C
to_chat(user, "You start removing the inner layer of shielding...")
playsound(src, W.usesound, 100, 1)
- if(do_after(user, 40*W.toolspeed, 1, target = src))
+ if(do_after(user, 40 * W.toolspeed, 1, target = src))
if(!panel_open)
return
if(security_level != AIRLOCK_SECURITY_PLASTEEL_I_S)
@@ -860,7 +860,7 @@ About the new airlock wires panel:
return
to_chat(user, "You begin cutting the inner layer of shielding...")
playsound(loc, WT.usesound, 40, 1)
- if(do_after(user, 40*WT.toolspeed, 1, target = src))
+ if(do_after(user, 40 * WT.toolspeed, 1, target = src))
if(!panel_open || !WT.isOn())
return
playsound(loc, WT.usesound, 50, 1)
@@ -874,7 +874,7 @@ About the new airlock wires panel:
var/obj/item/weapon/crowbar/W = C
to_chat(user, "You start removing outer layer of shielding...")
playsound(src, W.usesound, 100, 1)
- if(do_after(user, 40*W.toolspeed, 1, target = src))
+ if(do_after(user, 40 * W.toolspeed, 1, target = src))
if(!panel_open)
return
if(security_level != AIRLOCK_SECURITY_PLASTEEL_O_S)
@@ -891,7 +891,7 @@ About the new airlock wires panel:
return
to_chat(user, "You begin cutting the outer layer of shielding...")
playsound(loc, WT.usesound, 40, 1)
- if(do_after(user, 40*WT.toolspeed, 1, target = src))
+ if(do_after(user, 40 * WT.toolspeed, 1, target = src))
if(!panel_open || !WT.isOn())
return
playsound(loc, WT.usesound, 50, 1)
@@ -907,7 +907,7 @@ About the new airlock wires panel:
return
to_chat(user, "You start cutting through the outer grille.")
playsound(src, W.usesound, 100, 1)
- if(do_after(user, 10*W.toolspeed, 1, target = src))
+ if(do_after(user, 10 * W.toolspeed, 1, target = src))
if(!panel_open)
return
user.visible_message("[user] cut through \the [src]'s outer grille.",
@@ -953,12 +953,12 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/try_to_weld(obj/item/weapon/weldingtool/W, mob/user)
if(!operating && density)
if(user.a_intent != INTENT_HELP)
- if(W.remove_fuel(0,user))
+ if(W.remove_fuel(0, user))
user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \
"You begin [welded ? "unwelding":"welding"] the airlock...", \
"You hear welding.")
playsound(loc, W.usesound, 40, 1)
- if(do_after(user,40*W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
+ if(do_after(user, 40 * W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
playsound(loc, 'sound/items/welder2.ogg', 50, 1)
welded = !welded
user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \
@@ -966,12 +966,12 @@ About the new airlock wires panel:
update_icon()
else
if(obj_integrity < max_integrity)
- if(W.remove_fuel(0,user))
+ if(W.remove_fuel(0, user))
user.visible_message("[user] is welding the airlock.", \
"You begin repairing the airlock...", \
"You hear welding.")
playsound(loc, W.usesound, 40, 1)
- if(do_after(user,40*W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
+ if(do_after(user, 40 * W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
playsound(loc, 'sound/items/welder2.ogg', 50, 1)
obj_integrity = max_integrity
stat &= ~BROKEN
@@ -994,7 +994,7 @@ About the new airlock wires panel:
playsound(loc, I.usesound, 100, 1)
user.visible_message("[user] removes the electronics from the airlock assembly.", \
"You start to remove electronics from the airlock assembly...")
- if(do_after(user,40*I.toolspeed, target = src))
+ if(do_after(user, 40 * I.toolspeed, target = src))
deconstruct(TRUE, user)
return
else if(arePowerSystemsOn())
@@ -1021,7 +1021,7 @@ About the new airlock wires panel:
if(istype(I, /obj/item/weapon/crowbar/power))
if(isElectrified())
- shock(user,100)//it's like sticking a forck in a power socket
+ shock(user, 100)//it's like sticking a forck in a power socket
return
if(!density)//already open
@@ -1038,9 +1038,9 @@ About the new airlock wires panel:
var/time_to_open = 5
if(arePowerSystemsOn() && !prying_so_hard)
time_to_open = 50
- playsound(src, 'sound/machines/airlock_alien_prying.ogg',100,1) //is it aliens or just the CE being a dick?
+ playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1) //is it aliens or just the CE being a dick?
prying_so_hard = TRUE
- var/result = do_after(user, time_to_open,target = src)
+ var/result = do_after(user, time_to_open, target = src)
prying_so_hard = FALSE
if(result)
open(1)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index bb0329dac7b..bfb758bae75 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -223,7 +223,7 @@
else if(damage_amount)
playsound(loc, 'sound/weapons/smash.ogg', 50, 1)
else
- playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
playsound(loc, 'sound/items/welder.ogg', 100, 1)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index d0f8a25e5ba..6da265613dd 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -119,9 +119,9 @@
if(W.remove_fuel(0, user))
playsound(get_turf(src), W.usesound, 50, 1)
user.visible_message("[user] starts [welded ? "unwelding" : "welding"] [src].", "You start welding [src].")
- if(do_after(user, 40*W.toolspeed, 1, target=src))
+ if(do_after(user, 40 * W.toolspeed, 1, target=src))
welded = !welded
- to_chat(user, "[user] [welded?"welds":"unwelds"] [src].", "You [welded ? "weld" : "unweld"] [src].")
+ to_chat(user, "[user] [welded ? "welds" : "unwelds"] [src].", "You [welded ? "weld" : "unweld"] [src].")
update_icon()
/obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 5cb8e2cab0f..b5d56555c3d 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -26,7 +26,7 @@
armor_protection = armor[damage_flag]
if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor.
armor_protection = Clamp(armor_protection - armour_penetration, 0, 100)
- return round(damage_amount * (100 - armor_protection)*0.01, 0.1)
+ return round(damage_amount * (100 - armor_protection) * 0.01, 0.1)
//the sound played when the obj is damaged.
/obj/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 399ba4f42fa..10b923a7726 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -86,7 +86,7 @@ obj/structure/windoor_assembly/Destroy()
if(do_after(user, 40 * WT.toolspeed, target = src))
if(!src || !WT.isOn())
return
- to_chat(user, "You disasemble the windoor assembly.")
+ to_chat(user, "You disassemble the windoor assembly.")
var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5)
RG.add_fingerprint(user)
if(secure)
diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm
index 7772740a9f2..711d47d5d98 100644
--- a/code/game/objects/weapons.dm
+++ b/code/game/objects/weapons.dm
@@ -1,11 +1,4 @@
/obj/item/weapon
name = "weapon"
icon = 'icons/obj/weapons.dmi'
-
-/obj/item/weapon/New()
- ..()
- if(!hitsound)
- if(damtype == BURN)
- hitsound = 'sound/items/welder.ogg'
- if(damtype == BRUTE)
- hitsound = "swing_hit"
\ No newline at end of file
+ hitsound = "swing_hit"
\ No newline at end of file
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index c4460519521..e4237cc49fd 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -510,7 +510,7 @@
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
- playsound(loc, 'sound/items/welder.ogg', 100, 1)
+ playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/structure/spacevine/obj_destruction()
wither()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f2849c1813d..a522119eae4 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -988,7 +988,7 @@
if(sharpness)
to_chat(user, "You begin to butcher [src]...")
playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
- if(do_mob(user, src, 80/sharpness) && Adjacent(I))
+ if(do_mob(user, src, 80 / sharpness) && Adjacent(I))
harvest(user)
return 1
diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm
deleted file mode 100644
index aa225f0741b..00000000000
--- a/code/modules/mob/living/silicon/damage_procs.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE)
- blocked = (100-blocked)/100
- if(!damage || (blocked <= 0))
- return 0
- switch(damagetype)
- if(BRUTE)
- adjustBruteLoss(damage * blocked)
- if(BURN)
- adjustFireLoss(damage * blocked)
- else
- return 1
- updatehealth()
- return 1