Skip to content

Commit

Permalink
TGUI bug roundup part 6 (#16630)
Browse files Browse the repository at this point in the history
* taj chat colours

* ah, I finally said it for real - I love you

* cl

* lost my halo, now I'm my own antichrist

* and I say hey...

* doing htat is probably a good idea

---------

Co-authored-by: Matt Atlas <[email protected]>
  • Loading branch information
NonQueueingMatt and Matt Atlas authored Jul 4, 2023
1 parent 6b6b916 commit 2030420
Show file tree
Hide file tree
Showing 21 changed files with 112 additions and 29 deletions.
2 changes: 2 additions & 0 deletions code/game/gamemodes/changeling/implements/powers/body.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
remove_verb(src, /mob/proc/changeling_transform)
ADD_VERB_IN(src, 10, /mob/proc/changeling_transform)

client.init_verbs()

changeling_update_languages(changeling.absorbed_languages)

feedback_add_details("changeling_powers", "TR")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
/obj/item/clothing/under/chameleon/changeling/verb/shred() //Remove individual pieces if needed.
set name = "Shred Jumpsuit"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -105,6 +106,7 @@
/obj/item/clothing/head/chameleon/changeling/verb/shred() //The copypasta is real.
set name = "Shred Helmet"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -130,6 +132,7 @@
/obj/item/clothing/suit/chameleon/changeling/verb/shred()
set name = "Shred Suit"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -155,6 +158,7 @@
/obj/item/clothing/shoes/chameleon/changeling/verb/shred()
set name = "Shred Shoes"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -180,6 +184,7 @@
/obj/item/storage/backpack/chameleon/changeling/verb/shred()
set name = "Shred Backpack"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand Down Expand Up @@ -208,6 +213,7 @@
/obj/item/clothing/gloves/chameleon/changeling/verb/shred()
set name = "Shred Gloves"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -234,6 +240,7 @@
/obj/item/clothing/mask/chameleon/changeling/verb/shred()
set name = "Shred Mask"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -260,6 +267,7 @@
/obj/item/clothing/glasses/chameleon/changeling/verb/shred()
set name = "Shred Glasses"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand All @@ -285,6 +293,7 @@
/obj/item/storage/belt/chameleon/changeling/verb/shred()
set name = "Shred Belt"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand Down Expand Up @@ -317,6 +326,7 @@
/obj/item/card/id/syndicate/changeling/verb/shred()
set name = "Shred ID Card"
set category = "Chameleon Items"
set src in usr
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
playsound(src, 'sound/effects/splat.ogg', 30, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ Class Procs:
if((. = .(candidate)))
return

/obj/machinery/proc/on_user_login(mob/M)
/obj/proc/on_user_login(mob/M)
return

/obj/machinery/proc/set_emergency_state(var/new_security_level)
Expand Down
1 change: 1 addition & 0 deletions code/modules/admin/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,7 @@ var/global/enabled_spooking = 0
log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
feedback_add_details("admin_verb","CGD")
tomob.ckey = frommob.ckey
tomob.client.init_verbs()
qdel(frommob)
return 1

Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/client procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var/list/localhost_addresses = list(
// asset_cache
var/asset_cache_job
if(href_list["asset_cache_confirm_arrival"])
to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.")
//to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.")
//because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us
// into letting append to a list without limit.
asset_cache_job = asset_cache_confirm_arrival(href_list["asset_cache_confirm_arrival"])
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/living/silicon/robot/robot_helpers.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
/mob/living/silicon/robot/set_intent(var/set_intent)
a_intent = set_intent
cut_overlay(eye_overlay)
if(!length(module_sprites))
return
if(!length(cached_eye_overlays))
setup_eye_cache()
if(!stat)
eye_overlay = cached_eye_overlays[a_intent]
add_overlay(eye_overlay)

/mob/living/silicon/robot/proc/handle_panel_overlay()
cut_overlay(panel_overlay)
if(!length(cached_panel_overlays))
setup_panel_cache()
if(opened)
if(wires_exposed)
panel_overlay = cached_panel_overlays[ROBOT_PANEL_EXPOSED]
Expand Down Expand Up @@ -45,6 +51,8 @@
add_overlay(eye_overlay)

/mob/living/silicon/robot/proc/setup_panel_cache()
if(!length(module_sprites))
return
if(!module_sprites[icontype][ROBOT_PANEL])
return
var/panelprefix = custom_sprite ? src.ckey : module_sprites[icontype][ROBOT_PANEL] // Shoutout to Geeves.
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/changeling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
/mob/living/simple_animal/hostile/lesser_changeling/Initialize()
. = ..()
add_verb(src, /mob/living/proc/ventcrawl)
add_verb(src, /mob/living/simple_animal/hostile/lesser_changeling/verb/untransform)

/mob/living/simple_animal/hostile/lesser_changeling/mind_initialize()
..()
Expand All @@ -200,6 +201,7 @@
occupant.status_flags &= ~GODMODE
if(mind)
mind.transfer_to(occupant)
occupant.client.init_verbs()

visible_message("<span class='warning'>\The [src] explodes into a shower of gore!</span>")
gibs(src.loc)
Expand Down Expand Up @@ -228,6 +230,7 @@
occupant.status_flags &= ~GODMODE
if(mind)
mind.transfer_to(occupant)
occupant.client.init_verbs()
visible_message("<span class='warning'>\The [src] explodes into a shower of gore!</span>")
gibs(src.loc)
qdel(src)
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
if(.)
return TRUE

if(href == "Reply")
if(href_list["Reply"])
var/mob/living/user = usr
var/datum/ntnet_conversation/conv = locate(href_list["Reply"])
var/message = input(user, "Enter message or leave blank to cancel: ")
Expand Down
8 changes: 6 additions & 2 deletions code/modules/overmap/ship_weaponry/_targeting_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
data["platform_directions"] = list("NORTH", "NORTHEAST", "EAST", "SOUTHEAST", "SOUTH", "SOUTHWEST", "WEST", "NORTHWEST")
if(linked.targeting)
for(var/obj/machinery/ship_weapon/SW in linked.ship_weapons)
data["guns"] += list(get_gun_data(SW))
if(!SW.special_firing_mechanism)
data["guns"] += list(get_gun_data(SW))
data["targeting"] = list(
"name" = linked.targeting.name,
"shiptype" = linked.targeting.shiptype,
Expand Down Expand Up @@ -112,7 +113,10 @@
if(!params["entrypoint"])
return
var/our_entrypoint = params["entrypoint"]
selected_entrypoint = names_to_entries[our_entrypoint]
if(our_entrypoint == SHIP_HAZARD_TARGET)
selected_entrypoint = our_entrypoint
else
selected_entrypoint = names_to_entries[our_entrypoint]
. = TRUE

if("select_gun")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/designs/mechfab/prosthetics/external.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
var/obj/machinery/mecha_part_fabricator/mechfab = fabricator
for(var/model_path in subtypesof(build_path))
var/obj/item/organ/external/E = new model_path
if(E.robotize_type == mechfab.manufacturer)
if(E.robotize_type == mechfab.limb_manufacturer)
qdel(E)
return new model_path(newloc)
qdel(E)
Expand Down Expand Up @@ -68,4 +68,4 @@
name = "Prosthetic Groin Cap"
build_path = /obj/item/organ/external/groin/ipc/unbranded/cap
use_direct_buildpath = TRUE
materials = list(DEFAULT_WALL_MATERIAL = 25000)
materials = list(DEFAULT_WALL_MATERIAL = 25000)
51 changes: 51 additions & 0 deletions html/changelogs/mattatlas-hoshinosama.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
################################
# 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
# admin
# backend
# security
# refactor
#################################

# Your name.
author: MattAtlas

# 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: "Fixed ling lesser form transformation not updating your verbs."
- bugfix: "Fixed ling shred equipment verbs not working."
- bugfix: "Fixed aghost clickdrag not resetting verbs."
- bugfix: "Fixed a leftover asset debug line."
- bugfix: "Fixed some cyborg runtimes."
- bugfix: "Lesser form lings can now actually transform back at will."
- bugfix: "Ship guns can now actually fire on hazards."
- bugfix: "Fixed printing prosthetic limbs of different types."
- bugfix: "Fixed some tajara languages having a darker colour."
- bugfix: "Fixed replying to a PDA message through the chat link not working."
- bugfix: "Deselecting the input box in PDA messaging no longer sends a message."
1 change: 1 addition & 0 deletions tgui/docs/component-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ A basic text input, which allow users to enter text into a UI.
- `placeholder: string` - Text placed into Input box when it's empty,
otherwise nothing. Clears automatically when focused.
- `fluid: boolean` - Fill all available horizontal space.
- `strict: boolean` - Prevent the onChange event from firing on unfocus.
- `selfClear: boolean` - Clear after hitting enter, as well as remain focused
when this happens. Useful for things like chat inputs.
- `onChange: (e, value) => void` - An event, which fires when you commit
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -525,10 +525,10 @@ em {
color: #543354;
}
.tajaran {
color: #803b56;
color: #b15377;
}
.tajaran_signlang {
color: #941c1c;
color: #cc2c2c;
}
.skrell {
color: #00ced1;
Expand Down Expand Up @@ -561,7 +561,7 @@ em {
color: #400987;
}
.delvahhi {
color: #5e2612;
color: #914123;
font-weight: bold;
}
.siiktau {
Expand Down
4 changes: 3 additions & 1 deletion tgui/packages/tgui/components/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ export class Input extends Component {
this.handleBlur = (e) => {
const { editing } = this.state;
const { onChange } = this.props;
const { strict } = this.props;
if (editing) {
this.setEditing(false);
if (onChange) {
if (onChange && !strict) {
onChange(e, e.target.value);
}
}
Expand Down Expand Up @@ -126,6 +127,7 @@ export class Input extends Component {
value,
maxLength,
placeholder,
strict,
...boxProps
} = props;
// Box props
Expand Down
1 change: 1 addition & 0 deletions tgui/packages/tgui/interfaces/ChatClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ export const Chat = (props, context) => {
placeholder="Type your message. Press enter to send."
width="100%"
selfClear
strict
onInput={(e, v) => setNewMessage(v)}
onChange={(e, v) =>
act('send', {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Gunnery.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BooleanLike } from 'common/react';
import { BooleanLike } from '../../common/react';
import { capitalizeAll } from '../../common/string';
import { useBackend } from '../backend';
import { Button, Section, Box, LabeledList } from '../components';
Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tgui/public/tgui-say.bundle.js

Large diffs are not rendered by default.

Loading

0 comments on commit 2030420

Please sign in to comment.