diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 60dbcc5cd8d..b092271fc96 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -309,15 +309,12 @@ SUBSYSTEM_DEF(ticker)
cinematic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
cinematic.screen_loc = "1,0"
- var/obj/structure/bed/temp_buckle = new(src)
if(station_missed)
for(var/mob/M in GLOB.mob_list)
- M.buckled = temp_buckle //buckles the mob so it can't do anything
if(M.client)
M.client.screen += cinematic //show every client the cinematic
else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived"
for(var/mob/M in GLOB.mob_list)
- M.buckled = temp_buckle
if(M.stat != DEAD)
var/turf/T = get_turf(M)
if(T && is_station_level(T.z) && !istype(M.loc, /obj/structure/closet/secure_closet/freezer))
@@ -387,8 +384,6 @@ SUBSYSTEM_DEF(ticker)
//Otherwise if its a verb it will continue on afterwards.
spawn(300)
QDEL_NULL(cinematic) //end the cinematic
- if(temp_buckle)
- qdel(temp_buckle) //release everybody
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 70b18377559..8c83c88f3d0 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -332,10 +332,12 @@ GLOBAL_LIST_EMPTY(teleport_runes)
user.forceMove(get_turf(actual_selected_rune))
var/mob/living/carbon/human/H = user
if(user.z != T.z)
- H.bleed(5)
+ if(istype(H))
+ H.bleed(5)
user.apply_damage(5, BRUTE)
else
- H.bleed(rand(5,10))
+ if(istype(H))
+ H.bleed(rand(5,10))
else
fail_invoke()
@@ -832,7 +834,8 @@ GLOBAL_LIST_EMPTY(teleport_runes)
fail_invoke()
log_game("Summon Cultist rune failed - target in away mission")
return
- if((cultist_to_summon.reagents.has_reagent("holywater") || cultist_to_summon.restrained()) && invokers.len < 3)
+ var/hard_summon = (cultist_to_summon.reagents && cultist_to_summon.reagents.has_reagent("holywater")) || cultist_to_summon.restrained()
+ if(hard_summon && invokers.len < 3)
to_chat(user, "The summoning of [cultist_to_summon] is being blocked somehow! You need 3 chanters to counter it!")
fail_invoke()
new /obj/effect/temp_visual/cult/sparks(get_turf(cultist_to_summon)) //observer warning
@@ -840,7 +843,7 @@ GLOBAL_LIST_EMPTY(teleport_runes)
return
..()
- if(cultist_to_summon.reagents.has_reagent("holywater") || cultist_to_summon.restrained())
+ if(hard_summon)
summontime = 20
if(do_after(user, summontime, target = loc))
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 70e0035be1f..7657b443daa 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -540,7 +540,7 @@
/obj/mecha/attack_alien(mob/living/user)
- log_message("Attack by alien. Attacker - [user].", red=TRUE)
+ log_message("Attack by alien. Attacker - [user].", TRUE)
playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE)
attack_generic(user, 15, BRUTE, "melee", 0)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index af673c7b285..5cbd562a002 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -84,27 +84,29 @@
/obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
- add_attack_logs(user, M, "Flashed with [src]")
- if(user && targeted)
- if(M.weakeyes)
- M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
- if(M.flash_eyes(1, 1))
- M.AdjustConfused(power)
- terrible_conversion_proc(M, user)
- M.Stun(1)
- visible_message("[user] blinds [M] with the flash!")
- to_chat(user, "You blind [M] with the flash!")
- to_chat(M, "[user] blinds you with the flash!")
+ if(user)
+ add_attack_logs(user, M, "Flashed with [src]")
+ if(targeted)
if(M.weakeyes)
- M.Stun(2)
- M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shields your eyes!")
- else
- visible_message("[user] fails to blind [M] with the flash!")
- to_chat(user, "You fail to blind [M] with the flash!")
- to_chat(M, "[user] fails to blind you with the flash!")
- else
- if(M.flash_eyes())
- M.AdjustConfused(power)
+ M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
+ if(M.flash_eyes(1, 1))
+ M.AdjustConfused(power)
+ terrible_conversion_proc(M, user)
+ M.Stun(1)
+ visible_message("[user] blinds [M] with the flash!")
+ to_chat(user, "You blind [M] with the flash!")
+ to_chat(M, "[user] blinds you with the flash!")
+ if(M.weakeyes)
+ M.Stun(2)
+ M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shields your eyes!")
+ else
+ visible_message("[user] fails to blind [M] with the flash!")
+ to_chat(user, "You fail to blind [M] with the flash!")
+ to_chat(M, "[user] fails to blind you with the flash!")
+ return
+
+ if(M.flash_eyes())
+ M.AdjustConfused(power)
/obj/item/flash/attack(mob/living/M, mob/user)
if(!try_use_flash(user))
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index c1491d5c0de..8a8f44099ce 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -11,6 +11,9 @@
var/propadjust = query.item[2]
var/jobmask = query.item[3]
var/ok = 0
+ if(!path || !ispath(path))
+ log_debug("Incorrect database entry found in table 'customuseritems' path value = [path], cuiPath is null. cuiCKey='[M.ckey]' AND (cuiRealName='[sanitizeSQL(M.real_name)]' OR cuiRealName='*'")
+ continue
if(jobmask != "*")
var/list/allowed_jobs = splittext(jobmask,",")
for(var/i = 1, i <= allowed_jobs.len, i++)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 13eb62587be..9390885c558 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -54,7 +54,7 @@
else
healths.icon_state = "health6"
-/mob/living/carbon/alien/humanoid/queen/can_inject()
+/mob/living/carbon/alien/humanoid/queen/can_inject(mob/user, error_msg, target_zone, penetrate_thick)
return FALSE
//Queen verbs
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 59668d9fddb..22a48f9d9ee 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -374,7 +374,7 @@
return 0
// Living mobs use can_inject() to make sure that the mob is not syringe-proof in general.
-/mob/living/proc/can_inject()
+/mob/living/proc/can_inject(mob/user, error_msg, target_zone, penetrate_thick)
return TRUE
/mob/living/is_injectable(mob/user, allowmobs = TRUE)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index afdeaa66bee..cf3067b934f 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1133,7 +1133,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(!updating)
updating = 1
spawn(BORG_CAMERA_BUFFER)
- if(oldLoc != src.loc)
+ if(camera && oldLoc != src.loc)
GLOB.cameranet.updatePortableCamera(src.camera)
updating = 0
if(module)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index a62f5f9d358..65267911d7f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -92,7 +92,7 @@
/mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
return
-/mob/living/silicon/can_inject(mob/user, error_msg)
+/mob/living/silicon/can_inject(mob/user, error_msg, target_zone, penetrate_thick)
if(error_msg)
to_chat(user, "[p_their(TRUE)] outer shell is too tough.")
return FALSE
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index 53de1a16854..96a97c8fe1a 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -36,7 +36,7 @@
to_chat(user, "You put the rocket in [src].")
to_chat(user, "[rockets.len] / [max_rockets] rockets.")
else
- to_chat(usr, "[src] cannot hold more rockets.")
+ to_chat(user, "[src] cannot hold more rockets.")
else
return ..()
@@ -55,4 +55,4 @@
rockets -= I
qdel(I)
else
- to_chat(usr, "[src] is empty.")
+ to_chat(user, "[src] is empty.")