From 95595e45af256cf1ab604a3f8a7f7a013aee85f0 Mon Sep 17 00:00:00 2001 From: Ron Date: Mon, 25 Sep 2017 03:59:52 -0400 Subject: [PATCH] Bug fixes (#3493, #3428, #3444) (#3494) Removes some unused code Fixes #3493 Fixes #3428 Fixes #3444 --- code/__defines/math_physics.dm | 3 --- code/game/mecha/mecha.dm | 2 +- code/game/objects/items/weapons/implants/implanter.dm | 2 ++ code/global.dm | 5 ----- code/modules/library/lib_items.dm | 2 +- html/changelogs/Printer16-BugFixes1.yml | 5 +++++ 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/Printer16-BugFixes1.yml diff --git a/code/__defines/math_physics.dm b/code/__defines/math_physics.dm index 758b52d3d4f..80f8798bc75 100644 --- a/code/__defines/math_physics.dm +++ b/code/__defines/math_physics.dm @@ -24,9 +24,6 @@ #define INFINITY 1.#INF -#define TICKS_IN_DAY 24*60*60*10 -#define TICKS_IN_SECOND 10 - // A neat little helper to convert the value X, that's between imin and imax, into a value // that's proportionally scaled and in range of omin and omax. #define MAP(x, imin, imax, omin, omax) ((x - imin) * (omax - omin) / (imax - imin) + omin) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index f2f5a528468..67bf5d46837 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -625,7 +625,7 @@ src.occupant_message("\The [user]'s claws are stopped by the armor.") visible_message("\The [user] rebounds off [src.name]'s armor!") else - user.visible_message("\The [user] hits \the [src]. Nothing happensm","You hit \the [src] with no visible effect.") + user.visible_message("\The [user] hits \the [src]. Nothing happens.","You hit \the [src] with no visible effect.") src.log_append_to_last("Armor saved.") return else if ((HULK in user.mutations) && !deflect_hit(is_melee=1)) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index ea1b2508251..99a43943900 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -53,6 +53,8 @@ imp.part = affected BITSET(H.hud_updateflag, IMPLOYAL_HUD) + if(istype(src.imp, /obj/item/weapon/implanter/loyalty)) + M << "" src.imp = null update() diff --git a/code/global.dm b/code/global.dm index 00b9bfb6a9c..98eceb43135 100644 --- a/code/global.dm +++ b/code/global.dm @@ -163,10 +163,5 @@ var/global/obj/item/device/radio/intercom/global_announcer = new(null) var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") -var/global/const/TICKS_IN_DAY = 864000 -var/global/const/TICKS_IN_HOUR = 36000 -var/global/const/TICKS_IN_SECOND = 10 - - //List of exosuit tracking beacons, to save performance var/global/list/exo_beacons = list() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 4f27db33322..1e80f66aa9f 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -46,7 +46,7 @@ user << "You begin dismantling \the [src]." if(do_after(user,25)) user << "You dismantle \the [src]." - new /obj/item/stack/material/wood(get_turf(src), amount = 3) + new /obj/item/stack/material/wood(get_turf(src), 3) for(var/obj/item/weapon/book/b in contents) b.loc = (get_turf(src)) qdel(src) diff --git a/html/changelogs/Printer16-BugFixes1.yml b/html/changelogs/Printer16-BugFixes1.yml new file mode 100644 index 00000000000..7855a710351 --- /dev/null +++ b/html/changelogs/Printer16-BugFixes1.yml @@ -0,0 +1,5 @@ +author: Printer16 +delete-after: True +changes: + - bugfix: "Deconstructing book cases now gives the proper type of wood." + - bugfix: "You will now receive a message when implanted with a loyalty implant."