From 21aa0c2aaba26c5d3bb2c15ebcc685a4ee02ea5b Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 18 Aug 2016 00:19:29 -0400 Subject: [PATCH] further tweaks/fixes --- code/game/gamemodes/miniantags/borer/borer.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 4 ++-- code/modules/mining/equipment_locker.dm | 2 +- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index cd7a95ea619..73694f9a5c2 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -76,7 +76,7 @@ attacktext = "nips" friendly = "prods" wander = 0 - mob_size = MOB_SIZE_SMALL + mob_size = MOB_SIZE_TINY density = 0 pass_flags = PASSTABLE ventcrawler = 2 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 0c5e8140647..8e9424c4997 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -130,7 +130,7 @@ /obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) if(wielded && !slot_flags) - to_chat(M, "[src.name] is too cumbersome to carry with anything but your hands!") + to_chat(M, "[src] is too cumbersome to carry with anything but your hands!") return 0 return ..() @@ -141,7 +141,7 @@ if(H != null) to_chat(user, "[src] is too cumbersome to carry in one hand!") return - if(src.loc != user) + if(loc != user) wield(user) ..() diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index f73fa22c72e..418a8dbde9a 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -1211,4 +1211,4 @@ if(!charged) charged = 1 icon_state = "mining_hammer1" - playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) \ No newline at end of file + playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 569b1a535fe..72fef576d73 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -16,7 +16,7 @@ local_transmit = 1 ventcrawler = 2 magpulse = 1 - mob_size = MOB_SIZE_SMALL + mob_size = MOB_SIZE_TINY // We need to keep track of a few module items so we don't need to do list operations // every time we need them. These get set in New() after the module is chosen.