mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 17:41:50 +00:00
1b8bcd0365
## About The Pull Request Fixes #68825 Fixes #72249 Fixes #70184 Converts maintenance drones to use the basic mob framework. As drones don't use AI, this was mostly a perfunctory conversion, but I took the opportunity to clean up drone code a bit and fixed a few bugs. Noteworthy changes: - Drones now have a `can_unhack` field. This is set to FALSE on syndrones, because unhacking them doesn't make them stop being evil but does cause some weirdness. Syndrones are unused right now, but you never know. - Drones use the Dextrous component for hand-having. - Drones no longer have an internal ID card, instead being given all-access with the `simple_access` component. - Picking up drones now works the same as for other mobs, instead of pointlessly copying the code into `attack_hand`. As a consequence, it is now possible to punch drones if you want to for some reason. - Drones can now reboot/cannibalize dead drones without being in combat mode. - Cannibalizing a drone that contains a client no longer runtimes - the client is ghosted ahead of time. - Drones now have TRAIT_ADVANCEDTOOLUSER, allowing them to properly interact with machines. - Trying to screwdriver a dead drone now gives a balloon alert about why you can't do that. In addition to these changes, I cleaned up the code quite a bit, organizing things better and placing more useful comments throughout. And removing a hell of a lot of single-letter variable names. I will note that this PR does _not_ address #72129. The issue there is that sprites for drones-as-hats are entirely nonexistent, and I'm not a spriter. It shouldn't be too hard to fix if someone makes dronehat sprites, though! ## Why It's Good For The Game Kills 8 more simple animals. In addition to that, drones were clearly a bit neglected, so this fixes them up a bit and makes the code a little bit clearer. Maybe not that much clearer, but it's something. It certainly leaves them in a better place for further work if anyone wants to do that. Plus, a bunch of bugs and other jankiness are fixed now, which is nice. ## Changelog 🆑 refactor: Maintenance Drones now use the basic mob framework. This shouldn't come with any noticeable gameplay changes, but please report any bugs. fix: Drones can now interact normally with electrified doors. fix: Drones' built-in tools can no longer be placed in storage objects and/or thrown on the floor. fix: Drones can now perform right-click interactions correctly, such as deconstructing reinforced windows. fix: Drones can now reboot or cannibalize other drones without being in combat mode. /🆑
46 lines
1.3 KiB
Plaintext
46 lines
1.3 KiB
Plaintext
/datum/hud/dextrous/drone/New(mob/owner)
|
|
..()
|
|
var/atom/movable/screen/inventory/inv_box
|
|
|
|
inv_box = new /atom/movable/screen/inventory(null, src)
|
|
inv_box.name = "internal storage"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "suit_storage"
|
|
// inv_box.icon_full = "template"
|
|
inv_box.screen_loc = ui_drone_storage
|
|
inv_box.slot_id = ITEM_SLOT_DEX_STORAGE
|
|
static_inventory += inv_box
|
|
|
|
inv_box = new /atom/movable/screen/inventory(null, src)
|
|
inv_box.name = "head/mask"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "mask"
|
|
// inv_box.icon_full = "template"
|
|
inv_box.screen_loc = ui_drone_head
|
|
inv_box.slot_id = ITEM_SLOT_HEAD
|
|
static_inventory += inv_box
|
|
|
|
for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
|
|
if(inv.slot_id)
|
|
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
|
|
inv.update_appearance()
|
|
|
|
|
|
/datum/hud/dextrous/drone/persistent_inventory_update()
|
|
if(!mymob)
|
|
return
|
|
var/mob/living/basic/drone/drone = mymob
|
|
|
|
if(hud_shown)
|
|
if(!isnull(drone.internal_storage))
|
|
drone.internal_storage.screen_loc = ui_drone_storage
|
|
drone.client.screen += drone.internal_storage
|
|
if(!isnull(drone.head))
|
|
drone.head.screen_loc = ui_drone_head
|
|
drone.client.screen += drone.head
|
|
else
|
|
drone.internal_storage?.screen_loc = null
|
|
drone.head?.screen_loc = null
|
|
|
|
..()
|