fixes some amtag bugs (#19032)

* new

* 2

* e²

* e³

* e£

* glang

* e¢

* e¬

* e

* e12
This commit is contained in:
tattax
2023-05-29 01:11:26 -03:00
committed by GitHub
parent 0605c0e634
commit 169d32074e
51 changed files with 430 additions and 388 deletions

View File

@@ -4,13 +4,13 @@
/atom/movable/screen/ghost/MouseEntered()
flick(icon_state + "_anim", src)
/atom/movable/screen/ghost/jumptomob
/atom/movable/screen/ghost/jump_to_mob
name = "Jump to mob"
icon_state = "jumptomob"
icon_state = "jump_to_mob"
/atom/movable/screen/ghost/jumptomob/Click()
/atom/movable/screen/ghost/jump_to_mob/Click()
var/mob/dead/observer/G = usr
G.jumptomob()
G.jump_to_mob()
/atom/movable/screen/ghost/orbit
name = "Orbit"
@@ -48,8 +48,8 @@
..()
var/atom/movable/screen/using
using = new /atom/movable/screen/ghost/jumptomob()
using.screen_loc = ui_ghost_jumptomob
using = new /atom/movable/screen/ghost/jump_to_mob()
using.screen_loc = ui_ghost_jump_to_mob
static_inventory += using
using = new /atom/movable/screen/ghost/orbit()

View File

@@ -61,7 +61,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/healths
var/atom/movable/screen/healthdoll
var/atom/movable/screen/internals
var/atom/movable/screen/stamina
// subtypes can override this to force a specific UI style
@@ -115,7 +114,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
healths = null
stamina = null
healthdoll = null
internals = null
devilsouldisplay = null
blobpwrdisplay = null
alien_plasma_display = null

View File

@@ -276,9 +276,6 @@
rest_icon.screen_loc = ui_above_movement
static_inventory += rest_icon
internals = new /atom/movable/screen/internals()
infodisplay += internals
healths = new /atom/movable/screen/healths()
infodisplay += healths

View File

@@ -78,9 +78,6 @@
throw_icon.screen_loc = ui_drop_throw
hotkeybuttons += throw_icon
internals = new /atom/movable/screen/internals()
infodisplay += internals
healths = new /atom/movable/screen/healths()
infodisplay += healths

View File

@@ -324,59 +324,6 @@
icon = 'icons/mob/screen_cyborg.dmi'
screen_loc = ui_borg_intents
/atom/movable/screen/internals
name = "toggle internals"
icon_state = "internal0"
screen_loc = ui_internal
/atom/movable/screen/internals/Click()
if(!iscarbon(usr))
return
var/mob/living/carbon/C = usr
if(C.incapacitated())
return
if(C.internal)
C.close_internals()
to_chat(C, span_notice("You are no longer running on internals."))
icon_state = "internal0"
else
if (!C.can_breathe_internals())
to_chat(C, span_warning("You are not wearing a suitable internals mask!"))
return
var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank)
if(I)
to_chat(C, span_notice("You are now running on internals from [I] in your [C.get_held_index_name(C.get_held_index_of_item(I))]."))
C.open_internals(I)
else if(ishuman(C))
var/mob/living/carbon/human/H = C
if(istype(H.s_store, /obj/item/tank))
to_chat(H, span_notice("You are now running on internals from [H.s_store] on your [H.wear_suit.name]."))
H.open_internals(H.s_store)
else if(istype(H.belt, /obj/item/tank))
to_chat(H, span_notice("You are now running on internals from [H.belt] on your belt."))
H.open_internals(H.belt)
else if(istype(H.l_store, /obj/item/tank))
to_chat(H, span_notice("You are now running on internals from [H.l_store] in your left pocket."))
H.open_internals(H.l_store)
else if(istype(H.r_store, /obj/item/tank))
to_chat(H, span_notice("You are now running on internals from [H.r_store] in your right pocket."))
H.open_internals(H.r_store)
//Separate so CO2 jetpacks are a little less cumbersome.
if(!C.internal && istype(C.back, /obj/item/tank))
to_chat(C, span_notice("You are now running on internals from [C.back] on your back."))
C.open_internals(C.back)
if(C.internal)
icon_state = "internal1"
else
to_chat(C, span_warning("You don't have a suitable tank!"))
return
C.update_mob_action_buttons()
/atom/movable/screen/mov_intent
name = "run/walk toggle"
icon = 'icons/mob/screen_midnight.dmi'