diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 73a7b5f2c28..1db02872e47 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1305,15 +1305,15 @@ var/datum/announcement/minor/admin_min_announcer = new
if(2) //Admins
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)](?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (CA) (TAKE)"
+ return "[key_name(C, link, name, highlight_special)](?) (PP) (VV) (SM) ([admin_jump_link(M)]) (CA) (TAKE)"
if(3) //Devs
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)](VV)([admin_jump_link(M, src)]) (TAKE)"
+ return "[key_name(C, link, name, highlight_special)](VV)([admin_jump_link(M)]) (TAKE)"
if(4) //Event Managers
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)] (?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (TAKE)"
+ return "[key_name(C, link, name, highlight_special)] (?) (PP) (VV) (SM) ([admin_jump_link(M)]) (TAKE)"
/proc/ishost(whom)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 717e653731d..4839754fa94 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -250,6 +250,7 @@ proc/check_panel(mob/M)
src.health -= P.force
/obj/effect/fake_attacker/Crossed(var/mob/M, somenumber)
+ . = ..()
if(M == my_target)
step_away(src,my_target,2)
if(prob(30))
diff --git a/code/modules/gamemaster/actions/infestation.dm b/code/modules/gamemaster/actions/infestation.dm
index c3c8a5f3e22..43da6fae704 100644
--- a/code/modules/gamemaster/actions/infestation.dm
+++ b/code/modules/gamemaster/actions/infestation.dm
@@ -5,6 +5,7 @@
#define LOC_HYDRO 4
#define LOC_VAULT 5
#define LOC_TECH 7
+#define LOC_CONSTR 9
#define LOC_GARDEN 8
#define VERM_MICE 0
@@ -109,6 +110,7 @@
#undef LOC_VAULT
#undef LOC_TECH
#undef LOC_GARDEN
+#undef LOC_CONSTR
#undef VERM_MICE
#undef VERM_LIZARDS
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 4faf3557d10..847576bde23 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -166,8 +166,8 @@
var/obj/machinery/mineral/output = null
var/obj/machinery/mineral/console = null
var/sheets_per_tick = 10
- var/list/ores_processing[0]
- var/list/ores_stored[0]
+ var/list/ores_processing = list()
+ var/list/ores_stored = list()
var/static/list/alloy_data
var/active = FALSE
diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm
index bef7510282a..0cd0cae3fd8 100644
--- a/code/modules/mob/living/bot/mulebot.dm
+++ b/code/modules/mob/living/bot/mulebot.dm
@@ -255,7 +255,6 @@
H.apply_damage(0.5 * damage, BRUTE, BP_R_ARM)
blood_splatter(src, H, 1)
- ..()
/mob/living/bot/mulebot/relaymove(var/mob/user, var/direction)
if(load == user)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 2caf082ac0e..f1ce294e83c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1288,7 +1288,7 @@
if(4)
src.take_organ_damage(0,5,emp=1)
Confuse(5)
- flash_eyes(affect_human = 1)
+ flash_eyes()
src << "*BZZZT*"
src << "Warning: Electromagnetic pulse detected."
src << "Warning: Navigation systems offline. Restarting..."
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 3228523ac61..56713ad19a4 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -19,7 +19,7 @@
else
var/list/datum/sprite_accessory/hair/valid_hairstyles = list()
for(var/hair_string in hair_styles_list)
- var/list/datum/sprite_accessory/hair/test = hair_styles_list[hair_string]
+ var/datum/sprite_accessory/hair/test = hair_styles_list[hair_string]
if(test.flags & HAIR_TIEABLE)
valid_hairstyles.Add(hair_string)
selected_string = input("Select a new hairstyle", "Your hairstyle", hair_style) as null|anything in valid_hairstyles
diff --git a/code/modules/mob/living/carbon/human/human_resist.dm b/code/modules/mob/living/carbon/human/human_resist.dm
index 37e20d0d21a..a62ae55c6ec 100644
--- a/code/modules/mob/living/carbon/human/human_resist.dm
+++ b/code/modules/mob/living/carbon/human/human_resist.dm
@@ -89,8 +89,8 @@
/mob/living/carbon/human/proc/can_break_straight_jacket()
if((HULK in mutations) || species.can_shred(src,1))
- return 1
- return ..()
+ return TRUE
+ return FALSE
/mob/living/carbon/human/proc/break_straight_jacket()
visible_message(
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
index 74ddecbdbab..3adf61eabaf 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
@@ -130,7 +130,7 @@
else
..()
-/mob/living/simple_mob/protean_blob/stun_effect_act()
+/mob/living/simple_mob/protean_blob/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
return FALSE //ok so tasers hurt protean blobs what the fuck
/mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount,var/include_robo)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 56aff6a8edd..033ec7b724a 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -76,10 +76,10 @@
to_chat(src, "Warning: Electromagnetic pulse detected.")
..()
-/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount)
+/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
return //immune
-/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0)
+/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/stun = 1)
if(shock_damage > 0)
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, loc)
diff --git a/code/modules/mob/living/simple_mob/hands.dm b/code/modules/mob/living/simple_mob/hands.dm
index 0e8820fe2e9..587b897e1c5 100644
--- a/code/modules/mob/living/simple_mob/hands.dm
+++ b/code/modules/mob/living/simple_mob/hands.dm
@@ -10,7 +10,7 @@
hud_used.r_hand_hud_object.icon_state = "r_hand_active"
return
-/mob/living/simple_mob/put_in_hands(var/obj/item/W) // No hands.
+/mob/living/simple_mob/put_in_hands(obj/item/I, del_on_fail = FALSE, merge_stacks = TRUE, forced = FALSE) // No hands.
if(has_hands)
put_in_active_hand(W)
return 1
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 8bcebd8ee66..2c5f7cb764a 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -57,8 +57,8 @@
desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propell the ship."
icon = 'icons/turf/shuttle_parts.dmi'
icon_state = "nozzle"
- opacity = 1
- density = 1
+ opacity = TRUE
+ density = TRUE
can_atmos_pass = ATMOS_PASS_NO
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL
@@ -78,9 +78,6 @@
var/next_on
var/blockage
-/obj/machinery/atmospherics/unary/engine/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
- return 0
-
/obj/machinery/atmospherics/unary/engine/Initialize()
. = ..()
controller = new(src)
diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm
index e32c28e66bb..4142a931664 100644
--- a/code/modules/resleeving/infocore_records.dm
+++ b/code/modules/resleeving/infocore_records.dm
@@ -93,6 +93,7 @@
init_from_mob(copyfrom, add_to_db, ckeylock)
/datum/transhuman/body_record/Destroy()
+ . = ..()
mydna = null
client_ref = null
mind_ref = null
diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm
index 70e1c53d3fa..be385d5bc2a 100644
--- a/code/modules/resleeving/infomorph.dm
+++ b/code/modules/resleeving/infomorph.dm
@@ -425,7 +425,7 @@ var/list/infomorph_emotions = list(
if(silence_time)
to_chat(src, "Communication circuits remain uninitialized.")
else
- ..(msg)
+ return ..()
/mob/living/silicon/infomorph/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
switch(message_mode)
diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm
index 1a8cc95d52e..ad963877f17 100644
--- a/code/modules/shuttles/escape_pods.dm
+++ b/code/modules/shuttles/escape_pods.dm
@@ -68,6 +68,7 @@
ui.open()
ui.set_auto_update(1)
+/* THIS IS BROKEN
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/Topic(href, href_list)
if((. = ..()))
return
@@ -82,6 +83,7 @@
pod.launch(src)
return TOPIC_REFRESH
return 0
+*/
// This controller is for the escape pod berth (station side)
/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth