Skip to content

Commit

Permalink
[MIRROR] Assorted Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelbassil authored and SuhEugene committed Dec 16, 2023
1 parent be8b9be commit aa3106c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
15 changes: 9 additions & 6 deletions code/modules/overmap/ships/computers/ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,19 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
return 0

/obj/machinery/computer/ship/Destroy()
linked.consoles -= src
if (linked)
linked.consoles -= src
. = ..()

/obj/machinery/computer/ship/sensors/Destroy()
var/obj/machinery/shipsensors/sensor = sensor_ref.resolve()
LAZYREMOVE(sensor.linked_consoles, src)
sensor_ref = null
if(LAZYLEN(viewers))
if (sensor_ref)
var/obj/machinery/shipsensors/sensor = sensor_ref.resolve()
LAZYREMOVE(sensor.linked_consoles, src)
sensor_ref = null

if (LAZYLEN(viewers))
for(var/weakref/W in viewers)
var/M = W.resolve()
if(M)
if (M)
unlook(M)
. = ..()
4 changes: 2 additions & 2 deletions code/modules/power/apc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@
to_chat(user, SPAN_WARNING("The wire connection is in the way."))
return TRUE
var/obj/item/weldingtool/WT = W
if (WT.can_use(3, user))
return
if (!WT.can_use(3, user))
return TRUE
user.visible_message(SPAN_WARNING("\The [user] begins to weld \the [src]."), \
"You start welding the APC frame...", \
"You hear welding.")
Expand Down
6 changes: 3 additions & 3 deletions maps/torch/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
/obj/structure/sign/memorial/use_tool(obj/item/tool, mob/user, list/click_params)
// Dog Tags - Add dog tag
if (istype(tool, /obj/item/clothing/accessory/badge/solgov/tags))
if (!user.unEquip(tool, src))
FEEDBACK_UNEQUIP_FAILURE(user, tool)
return TRUE
var/obj/item/clothing/accessory/badge/solgov/tags/dog_tags = tool
if (!(dog_tags.owner_branch in accepted_branches))
USE_FEEDBACK_FAILURE("\The [src] only accepts dog tags from the [english_list(accepted_branches, and_text = " or ")] branches.")
return TRUE
if (!user.unEquip(tool, src))
FEEDBACK_UNEQUIP_FAILURE(user, tool)
return TRUE
fallen += "[dog_tags.owner_rank] [dog_tags.owner_name] | [dog_tags.owner_branch]"
user.visible_message(
SPAN_NOTICE("\The [user] adds \a [tool] to \the [src]."),
Expand Down

0 comments on commit aa3106c

Please sign in to comment.