diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 35d6cadd83e..858411fcfe0 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -156,7 +156,7 @@ else assembly.state = 1 user << "You cut \the [src] free from the wall." - new /obj/item/stack/cable_coil(src.loc, length=2) + new /obj/item/stack/cable_coil(loc, 2) assembly = null //so qdel doesn't eat it. qdel(src) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index ae16caccc4a..3caa8bd8fc8 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -22,6 +22,7 @@ var/scan_id = 1 var/is_secure = 0 var/datum/wires/smartfridge/wires = null + atmos_canpass = CANPASS_NEVER /obj/machinery/smartfridge/secure is_secure = 1 diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 439d357efa6..59c538c6b2d 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -23,13 +23,15 @@ var/safedrop = 0//Used to tell when we should or shouldn't spill if the tray is dropped. //Safedrop is set true when throwing, because it will spill on impact. And when placing on a table - var/list/valid = list( /obj/item/weapon/reagent_containers, + var/list/valid = list( + /obj/item/weapon/reagent_containers, /obj/item/weapon/material/kitchen/utensil, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/clothing/mask/smokable, /obj/item/weapon/storage/box/matches, /obj/item/weapon/flame/match, - /obj/item/weapon/material/ashtray) + /obj/item/weapon/material/ashtray + ) /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone) @@ -38,7 +40,6 @@ // Drop all the things. All of them. spill(user, M.loc) - //Note: Added a robot check to all stun/weaken procs, beccause weakening a robot causes its active modules to bug out if((CLUMSY in user.mutations) && prob(50)) //What if he's a clown? M << "You accidentally slam yourself with the [src]!" @@ -236,10 +237,12 @@ /obj/item/weapon/tray/proc/load_item(var/obj/item/I, var/mob/user) user.remove_from_mob(I) - I.loc = src + I.forceMove(src) current_weight += I.w_class carrying += I - add_overlay(image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer, "pixel_x" = I.pixel_x, "pixel_y" = I.pixel_y)) + var/mutable_appearance/MA = new(I) + MA.layer = FLOAT_LAYER + add_overlay(MA) //rand(0, (max_offset_y*2)-3)-(max_offset_y)-3 /obj/item/weapon/tray/verb/unload() diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index 17df0f742c4..d59b0d3b7f1 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -192,11 +192,11 @@ if ("help") var/html = "" html += "A character's signature can be augmented with the following tags:
" - html += "" + html += "" html += "

Beyond that, a maximum of 100 symbols are allowed for the signature text." html += " Note that this includes mark-up symbols." diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 0aaeac7fd6c..bae2d3152c5 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -107,7 +107,7 @@ /obj/item/clothing/suit/wizrobe/gentlecoat name = "gentlemans coat" - desc = "A heavy threaded twead gray jacket. For a different sort of Gentleman." + desc = "A heavy threaded tweed gray jacket. For a different sort of Gentleman." icon_state = "gentlecoat" item_state = "gentlecoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm index 7fa740ad941..f95a2d3ec98 100644 --- a/code/modules/mob/living/living_powers.dm +++ b/code/modules/mob/living/living_powers.dm @@ -18,6 +18,7 @@ set name = "Devour Creature" set desc = "Attempt to eat a nearby creature, swallowing it whole if small enough, or eating it piece by piece otherwise" var/list/choices = list() + for(var/mob/living/C in view(1,src)) if((!(src.Adjacent(C)) || C == src)) continue//cant steal nymphs right out of other gestalts @@ -26,7 +27,11 @@ var/mob/living/carbon/alien/diona/D = C if (D.gestalt) continue - choices.Add(C) + + if (C in src) // Just no. + continue + + choices += C var/mob/living/L = input(src,"Which creature do you wish to consume?") in null|choices @@ -65,4 +70,4 @@ src << "Walking speed has now been limited to [newspeed] tiles per second, which is [(newspeed/speed)*100]% of your normal walking speed." - src.min_walk_delay = (10 / newspeed) \ No newline at end of file + src.min_walk_delay = (10 / newspeed)