mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
BatrachophrenoandGitHub
8111a8489b
Many, many, many items have inhand sprites in their .dmis but for whatever reasons do not display them in-game. This PR: 1. Updates many item definitions to point to their already-existing inhands correctly. This consists largely of held tools, but also gas tanks and jetpacks mounted in the suit storage slot. 2. Adds a few codersprites made by me for objects with either missing inhands or poorly matching mishands (IE, the tape recorder, which has a black case, reused the white inhand sprites of the health analyzer). The new sprites are modified or recolored variations of other inhand sprites from our repo, except for circuitboards which are new. <img width="444" height="400" alt="image" src="https://github.com/user-attachments/assets/7f107b9a-fe24-4e31-8f16-4d34768ee117" /> 3. Adds inhand sprites for Inflatables and Inflatable Boxes made by Tomixcomics. <img width="424" height="101" alt="image" src="https://github.com/user-attachments/assets/434107c4-8577-49a2-a58e-d6b014c03933" /> 4. Ports inhand sprites for the Hydraulic Rescue Tool from tg's Jaws of Life. <img width="224" height="94" alt="Screenshot 2026-02-07 172931" src="https://github.com/user-attachments/assets/070c7956-f6a8-4fb5-870f-10c64afcc8b3" /> 5. Some additional cleanup while in the area. The 'analyzer' has been renamed the 'gas analyzer' to be consistent with the other analyzer objects, standardized icon_state naming conventions where I saw oddballs, updated code docs to use DMDocs when in the area, etc. ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | --- | --- | --- | | icons/obj/item/hydraulic_rescue_tool.dmi | [SomeAngryMiner (bee station)](https://github.com/BeeStation/BeeStation-Hornet/pull/2487), [maxymax (/tg/station)](https://github.com/tgstation/tgstation/pull/58616) | CC-BY-SA | | icons/obj/item/inflatables.dmi | [Tomixcomics](https://github.com/tomixcomics) | CC-BY-SA |
123 lines
4.7 KiB
Plaintext
123 lines
4.7 KiB
Plaintext
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
|
|
|
|
/obj/structure/computerframe
|
|
density = 1
|
|
anchored = 0
|
|
name = "computer frame"
|
|
icon = 'icons/obj/modular_computers/modular_console.dmi'
|
|
icon_state = "0"
|
|
build_amt = 5
|
|
var/state = 0
|
|
var/obj/item/circuitboard/circuit = null
|
|
|
|
/obj/structure/computerframe/attackby(obj/item/attacking_item, mob/user)
|
|
switch(state)
|
|
if(0)
|
|
if(attacking_item.tool_behaviour == TOOL_WRENCH)
|
|
if(attacking_item.use_tool(src, user, 20, volume = 50))
|
|
to_chat(user, SPAN_NOTICE("You wrench the frame into place."))
|
|
src.anchored = 1
|
|
src.state = 1
|
|
return TRUE
|
|
if(attacking_item.tool_behaviour == TOOL_WELDER)
|
|
var/obj/item/weldingtool/WT = attacking_item
|
|
if(!WT.use(0, user))
|
|
to_chat(user, "The welding tool must be on to complete this task.")
|
|
return TRUE
|
|
if(attacking_item.use_tool(src, user, 20, volume = 50))
|
|
if(!src || !WT.isOn()) return
|
|
to_chat(user, SPAN_NOTICE("You deconstruct the frame."))
|
|
new /obj/item/stack/material/steel( src.loc, 5 )
|
|
qdel(src)
|
|
return TRUE
|
|
if(1)
|
|
if(attacking_item.tool_behaviour == TOOL_WRENCH)
|
|
if(attacking_item.use_tool(src, user, 20, volume = 50))
|
|
to_chat(user, SPAN_NOTICE("You unfasten the frame."))
|
|
src.anchored = 0
|
|
src.state = 0
|
|
return TRUE
|
|
if(istype(attacking_item, /obj/item/circuitboard) && !circuit)
|
|
var/obj/item/circuitboard/B = attacking_item
|
|
if(B.board_type == BOARD_COMPUTER)
|
|
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
|
|
to_chat(user, SPAN_NOTICE("You place the circuit board inside the frame."))
|
|
src.icon_state = "1"
|
|
src.circuit = attacking_item
|
|
user.drop_from_inventory(attacking_item, src)
|
|
else
|
|
to_chat(user, SPAN_WARNING("This frame does not accept circuit boards of this type!"))
|
|
return TRUE
|
|
if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER && circuit)
|
|
attacking_item.play_tool_sound(get_turf(src), 50)
|
|
to_chat(user, SPAN_NOTICE("You screw the circuit board into place and screw the drawer shut."))
|
|
src.state = 2
|
|
src.icon_state = "2"
|
|
return TRUE
|
|
if(attacking_item.tool_behaviour == TOOL_CROWBAR && circuit)
|
|
attacking_item.play_tool_sound(get_turf(src), 50)
|
|
to_chat(user, SPAN_NOTICE("You remove the circuit board."))
|
|
src.state = 1
|
|
src.icon_state = "0"
|
|
circuit.forceMove(src.loc)
|
|
src.circuit = null
|
|
return TRUE
|
|
if(2)
|
|
if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER && circuit)
|
|
attacking_item.play_tool_sound(get_turf(src), 50)
|
|
to_chat(user, SPAN_NOTICE("You unfasten the circuit board."))
|
|
src.state = 1
|
|
src.icon_state = "1"
|
|
return TRUE
|
|
if(attacking_item.tool_behaviour == TOOL_CABLECOIL)
|
|
var/obj/item/stack/cable_coil/C = attacking_item
|
|
if (C.get_amount() < 5)
|
|
to_chat(user, SPAN_WARNING("You need five coils of wire to add them to the frame."))
|
|
return TRUE
|
|
to_chat(user, SPAN_NOTICE("You start to add cables to the frame."))
|
|
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
|
|
if(do_after(user, 2 SECONDS, src, DO_REPAIR_CONSTRUCT) && state == 2)
|
|
if (C.use(5))
|
|
to_chat(user, SPAN_NOTICE("You add cables to the frame."))
|
|
state = 3
|
|
icon_state = "3"
|
|
return TRUE
|
|
if(3)
|
|
if(attacking_item.tool_behaviour == TOOL_WIRECUTTER)
|
|
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
|
|
to_chat(user, SPAN_NOTICE("You remove the cables."))
|
|
src.state = 2
|
|
src.icon_state = "2"
|
|
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
|
|
A.amount = 5
|
|
return TRUE
|
|
|
|
if(istype(attacking_item, /obj/item/stack/material) && attacking_item.get_material_name() == "glass")
|
|
var/obj/item/stack/G = attacking_item
|
|
if (G.get_amount() < 2)
|
|
to_chat(user, SPAN_WARNING("You need two sheets of glass to put in the glass panel."))
|
|
return TRUE
|
|
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
|
|
to_chat(user, SPAN_NOTICE("You start to put in the glass keyboard."))
|
|
if(do_after(user, 2 SECONDS, src, DO_REPAIR_CONSTRUCT) && state == 3)
|
|
if (G.use(2))
|
|
to_chat(user, SPAN_NOTICE("You put in the glass keyboard."))
|
|
src.state = 4
|
|
src.icon_state = "4"
|
|
return TRUE
|
|
if(4)
|
|
if(attacking_item.tool_behaviour == TOOL_CROWBAR)
|
|
attacking_item.play_tool_sound(get_turf(src), 50)
|
|
to_chat(user, SPAN_NOTICE("You remove the glass keyboard."))
|
|
src.state = 3
|
|
src.icon_state = "3"
|
|
new /obj/item/stack/material/glass( src.loc, 2 )
|
|
return TRUE
|
|
if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER)
|
|
attacking_item.play_tool_sound(get_turf(src), 50)
|
|
to_chat(user, SPAN_NOTICE("You connect the glass keyboard."))
|
|
var/B = new src.circuit.build_path ( src.loc )
|
|
src.circuit.construct(B)
|
|
qdel(src)
|
|
return TRUE
|