diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 89821956852..4cd32138245 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -400,11 +400,6 @@ else return FALSE -/mob/living/carbon/human/get_talk_bubble() - if(!species || !species.talk_bubble_icon) - return ..() - return species.talk_bubble_icon - /mob/living/carbon/human/get_floating_chat_x_offset() if(!species) return ..() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 361af2b4700..5051ff00710 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -29,8 +29,6 @@ var/preview_icon = 'icons/mob/human_races/human/human_preview.dmi' var/bandages_icon - var/talk_bubble_icon - // Damage overlay and masks. var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi' var/damage_mask = 'icons/mob/human_races/masks/dam_mask_human.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index 57edab5013e..a809e42d2eb 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -332,14 +332,16 @@ icobase = 'icons/mob/human_races/vaurca/r_vaurcae.dmi' deform = 'icons/mob/human_races/vaurca/r_vaurcae.dmi' canvas_icon = 'icons/mob/base_48.dmi' - talk_bubble_icon = 'icons/mob/talk_bulwark.dmi' default_h_style = "Bulwark Classic Antennae" - icon_x_offset = -9 + icon_x_offset = -8 + floating_chat_x_offset = 8 + floating_chat_y_offset = 14 + typing_indicator_x_offset = 16 + typing_indicator_y_offset = 12 healths_x = 22 healths_overlay_x = 9 - floating_chat_x_offset = 6 damage_overlays = 'icons/mob/human_races/masks/dam_mask_bulwark.dmi' damage_mask = 'icons/mob/human_races/masks/dam_mask_bulwark.dmi' @@ -409,16 +411,16 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur /datum/species/bug/type_e/New() ..() equip_adjust = list( - slot_head_str = list( "[EAST]" = list("x" = 16, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), - slot_glasses_str = list( "[EAST]" = list("x" = 15, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 1, "y" = 0)), - slot_l_hand_str = list("[NORTH]" = list("x" = 6, "y" = 0), "[EAST]" = list("x" = 9, "y" = 2), "[SOUTH]" = list("x" = 12, "y" = 0), "[WEST]" = list("x" = 4, "y" = 0)), - slot_r_hand_str = list("[NORTH]" = list("x" = 12, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 6, "y" = 0), "[WEST]" = list("x" = 7, "y" = 2)), - slot_l_ear_str = list( "[EAST]" = list("x" = 0, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), - slot_r_ear_str = list( "[EAST]" = list("x" = 16, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), - slot_belt_str = list("[NORTH]" = list("x" = 9, "y" = 2), "[EAST]" = list("x" = 10, "y" = 1), "[SOUTH]" = list("x" = 9, "y" = 2), "[WEST]" = list("x" = 6, "y" = 1)), - slot_wear_id_str = list("[NORTH]" = list("x" = 0, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), - slot_wrists_str = list("[NORTH]" = list("x" = 15, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 4, "y" = 0), "[WEST]" = list("x" = 9, "y" = 0)), - slot_shoes_str = list("[NORTH]" = list("x" = 9, "y" = 0), "[EAST]" = list("x" = 8, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 8, "y" = 0)) + slot_head_str = list( "[EAST]" = list("x" = 15, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_glasses_str = list( "[EAST]" = list("x" = 14, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_l_hand_str = list("[NORTH]" = list("x" = 5, "y" = 0), "[EAST]" = list("x" = 8, "y" = 2), "[SOUTH]" = list("x" = 11, "y" = 0), "[WEST]" = list("x" = 3, "y" = 0)), + slot_r_hand_str = list("[NORTH]" = list("x" = 11, "y" = 0), "[EAST]" = list("x" = 11, "y" = 0), "[SOUTH]" = list("x" = 5, "y" = 0), "[WEST]" = list("x" = 6, "y" = 2)), + slot_l_ear_str = list( "[EAST]" = list("x" = 0, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_r_ear_str = list( "[EAST]" = list("x" = 15, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_belt_str = list("[NORTH]" = list("x" = 8, "y" = 2), "[EAST]" = list("x" = 9, "y" = 1), "[SOUTH]" = list("x" = 8, "y" = 2), "[WEST]" = list("x" = 5, "y" = 1)), + slot_wear_id_str = list("[NORTH]" = list("x" = 0, "y" = 0), "[EAST]" = list("x" = 11, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_wrists_str = list("[NORTH]" = list("x" = 14, "y" = 0), "[EAST]" = list("x" = 11, "y" = 0), "[SOUTH]" = list("x" = 3, "y" = 0), "[WEST]" = list("x" = 8, "y" = 0)), + slot_shoes_str = list("[NORTH]" = list("x" = 8, "y" = 0), "[EAST]" = list("x" = 7, "y" = 0), "[SOUTH]" = list("x" = 8, "y" = 0), "[WEST]" = list("x" = 7, "y" = 0)) ) /datum/species/bug/type_e/can_double_fireman_carry() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index a8080ad1812..fc9d2ae2170 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -1301,9 +1301,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(camera) camera.c_tag = real_name -/mob/proc/get_talk_bubble() - return 'icons/mob/talk.dmi' - /mob/proc/adjust_typing_indicator_offsets(var/atom/movable/typing_indicator/indicator) return diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 26a1fe3fab2..8c88964e0ce 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -295,13 +295,10 @@ /obj/item/gun/energy/vaurca/typec name = "thermal lance" desc = "A powerful piece of Zo'rane energy artillery, converted to be portable...if you weigh a metric tonne, that is." - icon = 'icons/mob/species/breeder/inventory.dmi' + icon = 'icons/obj/guns/megaglaive.dmi' + sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/obj/guns/megaglaive.dmi') icon_state = "megaglaive0" item_state = "megaglaive" - item_icons = list(//DEPRECATED. USE CONTAINED SPRITES IN FUTURE - slot_l_hand_str = 'icons/mob/species/breeder/held_l.dmi', - slot_r_hand_str = 'icons/mob/species/breeder/held_r.dmi' - ) origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8) fire_sound = 'sound/magic/lightningbolt.ogg' attack_verb = list("sundered", "annihilated", "sliced", "cleaved", "slashed", "pulverized") @@ -324,7 +321,6 @@ self_recharge = 1 recharge_time = 2 needspin = FALSE - is_wieldable = TRUE /obj/item/gun/energy/vaurca/typec/attack(mob/living/target_mob, mob/living/user, target_zone) diff --git a/html/changelogs/wezzy-bug-bugfixes.yml b/html/changelogs/wezzy-bug-bugfixes.yml new file mode 100644 index 00000000000..8fc9f08643e --- /dev/null +++ b/html/changelogs/wezzy-bug-bugfixes.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes invisible thermal lance inhands." + - bugfix: "Fixes bulwark chat bubbles." diff --git a/icons/mob/human_face/bulwark_hair.dmi b/icons/mob/human_face/bulwark_hair.dmi index 0c297d20637..6f1201498f3 100644 Binary files a/icons/mob/human_face/bulwark_hair.dmi and b/icons/mob/human_face/bulwark_hair.dmi differ diff --git a/icons/mob/human_face/eyes48x48.dmi b/icons/mob/human_face/eyes48x48.dmi index f9c00768225..ce16645c858 100644 Binary files a/icons/mob/human_face/eyes48x48.dmi and b/icons/mob/human_face/eyes48x48.dmi differ diff --git a/icons/mob/human_races/markings_vaurcae.dmi b/icons/mob/human_races/markings_vaurcae.dmi index e468e6a27dc..fbbc10c6db5 100644 Binary files a/icons/mob/human_races/markings_vaurcae.dmi and b/icons/mob/human_races/markings_vaurcae.dmi differ diff --git a/icons/mob/human_races/masks/blood_bulwark.dmi b/icons/mob/human_races/masks/blood_bulwark.dmi index f7c50a9a408..689d817dd51 100644 Binary files a/icons/mob/human_races/masks/blood_bulwark.dmi and b/icons/mob/human_races/masks/blood_bulwark.dmi differ diff --git a/icons/mob/human_races/masks/dam_bulwark.dmi b/icons/mob/human_races/masks/dam_bulwark.dmi index bc60e02cbd6..1afbc17749d 100644 Binary files a/icons/mob/human_races/masks/dam_bulwark.dmi and b/icons/mob/human_races/masks/dam_bulwark.dmi differ diff --git a/icons/mob/human_races/masks/dam_mask_bulwark.dmi b/icons/mob/human_races/masks/dam_mask_bulwark.dmi index e7d9ebc42f9..0ddbbf93a6c 100644 Binary files a/icons/mob/human_races/masks/dam_mask_bulwark.dmi and b/icons/mob/human_races/masks/dam_mask_bulwark.dmi differ diff --git a/icons/mob/human_races/vaurca/r_vaurcae.dmi b/icons/mob/human_races/vaurca/r_vaurcae.dmi index 921641071ef..aa17fc70780 100644 Binary files a/icons/mob/human_races/vaurca/r_vaurcae.dmi and b/icons/mob/human_races/vaurca/r_vaurcae.dmi differ diff --git a/icons/mob/species/breeder/held_l.dmi b/icons/mob/species/breeder/held_l.dmi deleted file mode 100644 index cc52c5f28e1..00000000000 Binary files a/icons/mob/species/breeder/held_l.dmi and /dev/null differ diff --git a/icons/mob/species/breeder/held_r.dmi b/icons/mob/species/breeder/held_r.dmi deleted file mode 100644 index 1ead1db2344..00000000000 Binary files a/icons/mob/species/breeder/held_r.dmi and /dev/null differ diff --git a/icons/mob/species/breeder/inventory.dmi b/icons/mob/species/breeder/inventory.dmi index 609e6ac4bf0..12fc5a99b01 100644 Binary files a/icons/mob/species/breeder/inventory.dmi and b/icons/mob/species/breeder/inventory.dmi differ diff --git a/icons/mob/species/bulwark/accessories.dmi b/icons/mob/species/bulwark/accessories.dmi index 695917ee768..28467cc4bbd 100644 Binary files a/icons/mob/species/bulwark/accessories.dmi and b/icons/mob/species/bulwark/accessories.dmi differ diff --git a/icons/mob/species/bulwark/augments_external.dmi b/icons/mob/species/bulwark/augments_external.dmi index 01111c7af31..bfbcb8f2737 100644 Binary files a/icons/mob/species/bulwark/augments_external.dmi and b/icons/mob/species/bulwark/augments_external.dmi differ diff --git a/icons/mob/species/bulwark/back.dmi b/icons/mob/species/bulwark/back.dmi index 13f760c6f03..c8622228705 100644 Binary files a/icons/mob/species/bulwark/back.dmi and b/icons/mob/species/bulwark/back.dmi differ diff --git a/icons/mob/species/bulwark/cuff.dmi b/icons/mob/species/bulwark/cuff.dmi index e47ccccd41d..23977048d70 100644 Binary files a/icons/mob/species/bulwark/cuff.dmi and b/icons/mob/species/bulwark/cuff.dmi differ diff --git a/icons/mob/species/bulwark/eyes.dmi b/icons/mob/species/bulwark/eyes.dmi index 6f1e59ee159..dd182fdd577 100644 Binary files a/icons/mob/species/bulwark/eyes.dmi and b/icons/mob/species/bulwark/eyes.dmi differ diff --git a/icons/mob/species/bulwark/fire.dmi b/icons/mob/species/bulwark/fire.dmi index a1c9668856a..0b7be165617 100644 Binary files a/icons/mob/species/bulwark/fire.dmi and b/icons/mob/species/bulwark/fire.dmi differ diff --git a/icons/mob/species/bulwark/head.dmi b/icons/mob/species/bulwark/head.dmi index 92eb5b65d2a..42936cde34a 100644 Binary files a/icons/mob/species/bulwark/head.dmi and b/icons/mob/species/bulwark/head.dmi differ diff --git a/icons/mob/species/bulwark/hoodie.dmi b/icons/mob/species/bulwark/hoodie.dmi index 42b5cfcba26..1dcf8f4aa0b 100644 Binary files a/icons/mob/species/bulwark/hoodie.dmi and b/icons/mob/species/bulwark/hoodie.dmi differ diff --git a/icons/mob/species/bulwark/horns.dmi b/icons/mob/species/bulwark/horns.dmi index c5734993620..6b4027203c4 100644 Binary files a/icons/mob/species/bulwark/horns.dmi and b/icons/mob/species/bulwark/horns.dmi differ diff --git a/icons/mob/species/bulwark/pants.dmi b/icons/mob/species/bulwark/pants.dmi index 91f3c547ea5..7fed2ded443 100644 Binary files a/icons/mob/species/bulwark/pants.dmi and b/icons/mob/species/bulwark/pants.dmi differ diff --git a/icons/mob/species/bulwark/shoes.dmi b/icons/mob/species/bulwark/shoes.dmi index 7cd69fd226a..66e0cb335a0 100644 Binary files a/icons/mob/species/bulwark/shoes.dmi and b/icons/mob/species/bulwark/shoes.dmi differ diff --git a/icons/mob/species/bulwark/suit.dmi b/icons/mob/species/bulwark/suit.dmi index b0cdf0144c7..ae05aa55bc7 100644 Binary files a/icons/mob/species/bulwark/suit.dmi and b/icons/mob/species/bulwark/suit.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index 7007b2f22a4..e9893c9ae88 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ diff --git a/icons/mob/species/bulwark/wrist.dmi b/icons/mob/species/bulwark/wrist.dmi index e8fb2c353d3..831ca1f9bf3 100644 Binary files a/icons/mob/species/bulwark/wrist.dmi and b/icons/mob/species/bulwark/wrist.dmi differ diff --git a/icons/mob/talk_bulwark.dmi b/icons/mob/talk_bulwark.dmi deleted file mode 100644 index eeb036b01f2..00000000000 Binary files a/icons/mob/talk_bulwark.dmi and /dev/null differ diff --git a/icons/obj/guns/megaglaive.dmi b/icons/obj/guns/megaglaive.dmi new file mode 100644 index 00000000000..ffc057a784a Binary files /dev/null and b/icons/obj/guns/megaglaive.dmi differ diff --git a/icons/obj/item/clothing/under/vaurca/bulwark/nralakk_uniforms.dmi b/icons/obj/item/clothing/under/vaurca/bulwark/nralakk_uniforms.dmi index d63400123a7..0c1e32b362a 100644 Binary files a/icons/obj/item/clothing/under/vaurca/bulwark/nralakk_uniforms.dmi and b/icons/obj/item/clothing/under/vaurca/bulwark/nralakk_uniforms.dmi differ