From aedcaab8027ce839f8aa10f1453d30b4bdb0d953 Mon Sep 17 00:00:00 2001 From: Ron Date: Fri, 6 Apr 2018 10:48:31 -0400 Subject: [PATCH] Bug Fixes (#4527) Fixes part of #4490 Fixes #4462 Fixes #4457 Fixes #3685 Closes #4331 Fixes #4254 Fixes #4258 Fixes #4209 Fixes #4030 Fixes #4525 Fixes #4461 Fixes #4524 --- code/__defines/mobs.dm | 2 - code/game/gamemodes/vampire/vampire_powers.dm | 2 +- code/game/machinery/computer/prisoner.dm | 6 +-- code/game/machinery/machinery.dm | 1 + code/game/mecha/mecha.dm | 4 ++ .../objects/items/weapons/cigs_lighters.dm | 2 +- .../mob/living/carbon/brain/brain_item.dm | 3 ++ .../modules/mob/living/silicon/robot/emote.dm | 2 +- code/modules/projectiles/guns/energy/magic.dm | 2 + .../projectiles/guns/energy/special.dm | 1 + .../reagents/reagent_containers/dropper.dm | 2 +- .../research/xenoarchaeology/finds/finds.dm | 1 + html/changelogs/Ron.yml | 48 +++++++++++++++++++ 13 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/Ron.yml diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index d49c51cb614..7915e1f320e 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -210,5 +210,3 @@ #define BRAIN_TRAUMA_MILD /datum/brain_trauma/mild #define BRAIN_TRAUMA_SEVERE /datum/brain_trauma/severe #define BRAIN_TRAUMA_SPECIAL /datum/brain_trauma/special - -#define BRAIN_DAMAGE_INTEGRITY_MULTIPLIER 0.5 diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index be8894b43a4..dd3aee3a915 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -747,7 +747,7 @@ admin_attack_log(src, T, "used diseased touch on [key_name(T)]", "was given a lethal disease by [key_name(src)]", "used diseased touch (virus info) on") - vampire.use_blood(200) + vampire.use_blood(100) verbs -= /mob/living/carbon/human/proc/vampire_diseasedtouch ADD_VERB_IN_IF(src, 1800, /mob/living/carbon/human/proc/vampire_diseasedtouch, CALLBACK(src, .proc/finish_vamp_timeout)) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 5eaa5b05bd5..9c1e4d8dda0 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -32,7 +32,7 @@ var/turf/Tr = null for(var/obj/item/weapon/implant/chem/C in implants) Tr = get_turf(C) - if((Tr) && (Tr.z != src.z)) continue//Out of range + if(Tr && !isStationLevel(Tr.z)) continue//Out of range if(!C.implanted) continue dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: " dat += "((1))" @@ -42,11 +42,11 @@ dat += "
Tracking Implants
" for(var/obj/item/weapon/implant/tracking/T in implants) Tr = get_turf(T) - if((Tr) && (Tr.z != src.z)) continue//Out of range + if(Tr && !isStationLevel(Tr.z)) continue//Out of range if(!T.implanted) continue var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in - if((M.z in current_map.station_levels) && !istype(M.loc, /turf/space)) + if(isStationLevel(M.z) && !istype(M.loc, /turf/space)) var/turf/mob_loc = get_turf(M) loc_display = mob_loc.loc if(T.malfunction) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 2c4d170c302..bd6941952ff 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -371,6 +371,7 @@ Class Procs: B.loc = src user << "[A.name] replaced with [B.name]." break + RefreshParts() update_icon() else user << "Following parts detected in the machine:" diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9fcdea31f40..dfcf2fc796c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -984,6 +984,10 @@ occupant << "The [src] has no traction! There is nothing solid in reach to launch off." return 0 + if(state) + occupant_message("Maintenance protocols in effect.") + return + lastcrash = world.time occupant << "You take a step back, and then..." diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 09c901a9012..ef7d6e24ab2 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -221,7 +221,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(W, /obj/item/weapon/melee/energy/sword)) var/obj/item/weapon/melee/energy/sword/S = W if(S.active) - light("[user] swings their [W], barely missing their nose. They light their [name] in the process.") + light("[user] swings their [W], barely missing themselves. They light their [name] in the process.") return diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 41db738eaf7..40178655c41 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -33,6 +33,9 @@ icon = 'icons/mob/alien.dmi' icon_state = "chitin" +/obj/item/organ/brain/xeno/gain_trauma() + return + /obj/item/organ/brain/Initialize(mapload) . = ..() health = config.default_brain_health diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 72e3853ea13..c40a1d464da 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -196,7 +196,7 @@ if("halt") if (istype(module,/obj/item/weapon/robot_module/security)) - message = "[src]'s speakers skreech, \"Halt! Security!\"." + message = "'s speakers skreech, \"Halt! Security!\"." playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) m_type = 2 diff --git a/code/modules/projectiles/guns/energy/magic.dm b/code/modules/projectiles/guns/energy/magic.dm index a6cffd1ff6e..4c537d1a6c5 100644 --- a/code/modules/projectiles/guns/energy/magic.dm +++ b/code/modules/projectiles/guns/energy/magic.dm @@ -18,6 +18,8 @@ charge_meter = 0 pin = /obj/item/device/firing_pin/magic +/obj/item/weapon/gun/energy/staff/emp_act(severity) // to prevent it from breaking. + return obj/item/weapon/gun/energy/staff/special_check(var/mob/living/user) if(HULK in user.mutations) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ea3d591aa67..29d933968ac 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -453,6 +453,7 @@ ) is_charging = 1 if(!do_after(user, 40)) + is_charging = FALSE return 0 is_charging = 0 if(!istype(user.get_active_hand(), src)) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 34c7d1a05bc..c5d2bc23b93 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -54,7 +54,7 @@ if(safe_thing) trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this) - user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You transfer [trans] units of the solution.") + user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You try to squirt something into [target]'s eyes, but fail!") return trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 00d1106f145..11d20fa3afa 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -210,6 +210,7 @@ new_box.max_w_class = pick(1,2,2,3,3,3,4,4) var/storage_amount = 2**(new_box.max_w_class-1) new_box.max_storage_space = rand(storage_amount, storage_amount * 10) + new_box.foldable = null if(prob(30)) apply_image_decorations = 1 if(12) diff --git a/html/changelogs/Ron.yml b/html/changelogs/Ron.yml new file mode 100644 index 00000000000..24d68a7593c --- /dev/null +++ b/html/changelogs/Ron.yml @@ -0,0 +1,48 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Printer16 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Updated the diseased touch information to show how much it actually uses." + - bugfix: "You can no longer fold artifact boxes into cardboard." + - bugfix: "EMP'ing magical staffs no longer breaks them." + - bugfix: "The RPED now works properly." + - bugfix: "Mechs can not use crash if they are in maintenance protocols." + - bugfix: "Updated the e-sword interaction with cigarettes." + - bugfix: "Xenos can no longer get brain traumuas." + - bugfix: "Using *halt as a cyborg no longer displays the name twice." + - bugfix: "Updated the eyedrop failure message." + - bugfix: "The thermal drill no longer breaks if you move while charging it." + - bugfix: "Updated implants to work on station zlevels." +