diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index f9528f2b2b9..0770a55c7eb 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 d918bead0de..f8123ce89c5 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -332,10 +332,12 @@ var/list/teleport_runes = list()
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 @@ var/list/teleport_runes = list()
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 @@ var/list/teleport_runes = list()
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 85f511395f1..a55a8a3be09 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].", color = "red")
+ 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/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 5c1250ed355..631228fed9b 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)
+ log_debug("Incorrect database entry found in table 'customuseritems', 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/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 1cded581118..9b28a6c4789 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1120,7 +1120,7 @@ var/list/robot_verbs_default = list(
if(!updating)
updating = 1
spawn(BORG_CAMERA_BUFFER)
- if(oldLoc != src.loc)
+ if(camera && oldLoc != src.loc)
cameranet.updatePortableCamera(src.camera)
updating = 0
if(module)
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.")