Skip to content

Commit

Permalink
Post-rebase updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Dec 18, 2023
1 parent ba3501d commit cadf871
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/_onclick/hud/screen/_screen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
appearance_flags = NO_CLIENT_COLOR
abstract_type = /obj/screen
is_spawnable_type = FALSE
simulated = FALSE

/// The mob that owns this screen object, if any.
var/weakref/owner_ref
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
var/obj/screen/bodytemp/bodytemp
var/obj/screen/health_warning/healths
var/obj/screen/throw_toggle/throw_icon
var/obj/screen/maneuver/maneuver_icon
var/obj/screen/food/nutrition_icon
var/obj/screen/drink/hydration_icon
var/obj/screen/pressure/pressure
Expand All @@ -57,7 +58,6 @@
var/obj/screen/gun/radio/radio_use_icon
var/obj/screen/gun/move/gun_move_icon
var/obj/screen/gun/mode/gun_setting_icon

var/obj/screen/ability_master/ability_master

/*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob.
Expand Down
1 change: 0 additions & 1 deletion mods/species/ascent/mobs/nymph/nymph_ui.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
var/ui_style = get_ui_style()
var/ui_color = get_ui_color()
var/ui_alpha = get_ui_alpha()
held = new( null, mymob, ui_style, ui_color, ui_alpha)
molt = new( null, mymob, ui_style, ui_color, ui_alpha)
food = new /obj/screen/food( null, mymob, ui_style, ui_color, ui_alpha)
drink = new /obj/screen/drink( null, mymob, ui_style, ui_color, ui_alpha)
Expand Down
1 change: 0 additions & 1 deletion mods/species/vox/datum/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
name = SPECIES_VOX
name_plural = SPECIES_VOX
base_prosthetics_model = /decl/bodytype/prosthetic/vox/crap
secret_codex_info = "Oh no, a shitbird."

default_emotes = list(
/decl/emote/audible/vox_shriek
Expand Down

0 comments on commit cadf871

Please sign in to comment.