cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP]DeIntegrates welder from omnitool & radial menu won't show already selected tool (#96443)

Browse Source 
## About The Pull Request
- See #96481 &
https://github.com/tgstation/tgstation/pull/96214#issuecomment-4697205835.
It's not worth the hastle but the revert was done in a bad way that
removes code & qol stuff so i did it better here.
- Radial menu won't show you the selected tool again thus reducing
clutter

## Changelog
🆑
del: removes the welder from the engiborg omnitool. They are now
separate entities again
qol: The omnitool radial menu won't show the same selected tool again
reducing clutter
/🆑
This commit is contained in:
SyncIt21
2026-06-13 17:29:20 +01:00
committed by GitHub
parent 1cb2fd09ec
commit b003f8fd97
5 changed files with 29 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/inventory.dm
-3
View File
@@ -257,7 +257,6 @@
if(module && module_active != held_items[module_num])
module.icon_state = "[module.base_icon_state] +a"
module_active = held_items[module_num]
SEND_SIGNAL(module_active, COMSIG_SILICON_MODULE_ACTIVATION, TRUE)
return TRUE
/**
@@ -269,8 +268,6 @@
var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_HAND_SLOT(module_num)]
if(module)
module.icon_state = module.base_icon_state
if(module_active)
SEND_SIGNAL(module_active, COMSIG_SILICON_MODULE_ACTIVATION, FALSE)
module_active = null
return TRUE
code/modules/mob/living/silicon/robot/robot_model.dm
+6 -1
View File
@@ -389,6 +389,7 @@
/obj/item/construction/rcd/borg,
/obj/item/pipe_dispenser,
/obj/item/extinguisher,
/obj/item/weldingtool/largetank/cyborg,
/obj/item/borg/cyborg_omnitool/engineering,
/obj/item/borg/cyborg_omnitool/engineering,
/obj/item/t_scanner,
@@ -412,6 +413,7 @@
model_select_icon = "engineer"
model_traits = list(TRAIT_NEGATES_GRAVITY)
hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4))
///Weakref to the night vision action
var/datum/weakref/night_vision_ref
/datum/action/cooldown/borg_meson
@@ -428,10 +430,12 @@
borg.update_sight()
/obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE)
var/datum/action/cooldown/borg_meson/night_vision = new(loc)
. = ..()
if(!.)
return
//Grant night vision action
var/datum/action/cooldown/borg_meson/night_vision = new(loc)
night_vision.Grant(loc)
night_vision_ref = WEAKREF(night_vision)
@@ -970,6 +974,7 @@
/obj/item/pipe_dispenser,
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/extinguisher,
/obj/item/weldingtool/largetank/cyborg,
/obj/item/analyzer,
/obj/item/borg/cyborg_omnitool/engineering,
/obj/item/borg/cyborg_omnitool/engineering,