mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
Adds/Fixes toolbelt power tool sprites and updates Proto Nitrate tools (#5431)
## About The Pull Request I've added sprites and made them show properly when you put power tools on belt, this includes: Power Drill, Jaws of Life, Science Power Drill, Hybrid Cutters As for Proto Nitrate tools - Reworked icons and added toolbelt sprites - Added sci tool variants (Proto Nitrate Hybrid Cutters from science CAN'T pry open doors) - Added crafting recipes for new tools - Reduced crafting time to 3s - Fixed Proto Nitrate welder missing flame sprite on its icon ## Why It's Good For The Game Toolbelts finally look properly Adding sci variants of Proto Nitrate tools means atmos can hand the hybrid cutters to crew without worrying about the prying idk why the hell I originally made crafting time for Proto Nitrate tools 20s but it's just annoying, so I'm cutting it down, you're already spending lot of time to actually make these crystals and long craft time makes it pain to mass produce for crew ## Proof Of Testing <img width="268" height="268" alt="image" src="https://github.com/user-attachments/assets/40c83d41-e850-49b2-86f5-2c9a84fd2652" /> <img width="515" height="796" alt="image" src="https://github.com/user-attachments/assets/c261042b-3ecf-43c0-8c9b-61596c0a3ca5" /> </details> ## Changelog 🆑 add: Added sci variants of Proto Nitrate power tools - available in crafting menu fix: Fixed power tools not showing on the toolbelts image: Reworked Proto Nitrate icons image: Added sprites for power tools on toolbelt /:cl
This commit is contained in:
@@ -1,23 +1,39 @@
|
||||
/datum/crafting_recipe/pn_jaws
|
||||
name = "Proto Nitrate Jaws of Life"
|
||||
result = /obj/item/crowbar/power/protonitrate
|
||||
time = 20 SECONDS
|
||||
time = 3 SECONDS
|
||||
reqs = list(/obj/item/crowbar/power = 1,
|
||||
/obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1)
|
||||
category = CAT_TOOLS
|
||||
|
||||
/datum/crafting_recipe/pn_jaws/science
|
||||
name = "Proto Nitrate Hybrid Cutters"
|
||||
result = /obj/item/crowbar/power/protonitrate/science
|
||||
time = 3 SECONDS
|
||||
reqs = list(/obj/item/crowbar/power/science = 1,
|
||||
/obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1)
|
||||
category = CAT_TOOLS
|
||||
|
||||
/datum/crafting_recipe/pn_drill
|
||||
name = "Proto Nitrate Hand Drill"
|
||||
result = /obj/item/screwdriver/power/protonitrate
|
||||
time = 20 SECONDS
|
||||
time = 3 SECONDS
|
||||
reqs = list(/obj/item/screwdriver/power = 1,
|
||||
/obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1)
|
||||
category = CAT_TOOLS
|
||||
|
||||
/datum/crafting_recipe/pn_drill/science
|
||||
name = "Proto Nitrate Hand Drill"
|
||||
result = /obj/item/screwdriver/power/protonitrate/science
|
||||
time = 3 SECONDS
|
||||
reqs = list(/obj/item/screwdriver/power/science = 1,
|
||||
/obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1)
|
||||
category = CAT_TOOLS
|
||||
|
||||
/datum/crafting_recipe/pn_welder
|
||||
name = "Proto Nitrate Welding Tool"
|
||||
result = /obj/item/weldingtool/experimental/protonitrate
|
||||
time = 20 SECONDS
|
||||
time = 3 SECONDS
|
||||
reqs = list(/obj/item/weldingtool/experimental = 1,
|
||||
/obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1)
|
||||
category = CAT_TOOLS
|
||||
|
||||
@@ -1,11 +1,31 @@
|
||||
// Power Tools Belt Overlays
|
||||
/obj/item/crowbar/power/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WIRECUTTER)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "jaws")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "jaws_on")
|
||||
|
||||
/obj/item/crowbar/power/science/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WIRECUTTER)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_jaws")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_jaws_on")
|
||||
|
||||
/obj/item/screwdriver/power/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WRENCH)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "drill")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "drill_on")
|
||||
|
||||
/obj/item/screwdriver/power/science/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WRENCH)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_drill")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_drill_on")
|
||||
|
||||
|
||||
// Proto Nitrate Tools
|
||||
/obj/item/crowbar/power/protonitrate
|
||||
name = "proto nitrate jaws of life"
|
||||
desc = "Hydraulic tool combined with Proto Nitrate Crystal for increased efficeincy."
|
||||
icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi'
|
||||
icon_state = "pn_jaws"
|
||||
lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi'
|
||||
righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi'
|
||||
inhand_icon_state = "pn_jaws"
|
||||
toolspeed = 0.5
|
||||
|
||||
/obj/item/crowbar/power/protonitrate/Initialize(mapload)
|
||||
@@ -28,19 +48,47 @@
|
||||
toolspeed = 0.25
|
||||
return COMPONENT_NO_DEFAULT_MESSAGE
|
||||
|
||||
/obj/item/crowbar/power/protonitrate/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WIRECUTTER)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_jaws")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_jaws_on")
|
||||
|
||||
/obj/item/crowbar/power/protonitrate/science
|
||||
name = "proto nitrate hybrid cutters" // hybrid between crowbar and wirecutters
|
||||
desc = "Hybrid cutters combined with Proto Nitrate Crystal for increased efficeincy but without the hydraulic force required to pry open doors."
|
||||
icon_state = "pn_jaws_sci"
|
||||
inhand_icon_state = "jaws_sci"
|
||||
force_opens = FALSE
|
||||
|
||||
/obj/item/crowbar/power/protonitrate/science/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WIRECUTTER)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_jaws")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_jaws_on")
|
||||
|
||||
/obj/item/screwdriver/power/protonitrate
|
||||
name = "proto nitrate hand drill"
|
||||
desc = "Hand drill combined with Proto Nitrate Crystal for increased efficeincy."
|
||||
icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi'
|
||||
icon_state = "pn_drill"
|
||||
lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi'
|
||||
righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi'
|
||||
inhand_icon_state = "pn_drill"
|
||||
toolspeed = 0.25
|
||||
|
||||
/obj/item/screwdriver/power/protonitrate/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WRENCH)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_drill")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_drill_on")
|
||||
|
||||
/obj/item/screwdriver/power/protonitrate/science
|
||||
icon_state = "pn_drill_sci"
|
||||
|
||||
/obj/item/screwdriver/power/protonitrate/science/get_belt_overlay()
|
||||
if(tool_behaviour != TOOL_WRENCH)
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_drill")
|
||||
return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_drill_on")
|
||||
|
||||
/obj/item/weldingtool/experimental/protonitrate
|
||||
name = "proto nitrate welding tool"
|
||||
desc = "An experimental welder further enchanced by combining it with Proto Nitrate Crystal."
|
||||
icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi'
|
||||
icon_state = "pn_welder"
|
||||
toolspeed = 0.25
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 604 B |
Binary file not shown.
|
Before Width: | Height: | Size: 591 B |
Binary file not shown.
|
After Width: | Height: | Size: 929 B |
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 28 KiB |
Reference in New Issue
Block a user