mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-23 00:22:12 +00:00
Standardised Contained Sprites : Now Atomic (#15142)
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
/obj/machinery/r_n_d
|
||||
name = "R&D device"
|
||||
icon = 'icons/obj/machines/research.dmi'
|
||||
icon = 'icons/obj/machinery/research.dmi'
|
||||
density = 1
|
||||
anchored = 1
|
||||
var/busy = 0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/machinery/r_n_d/server
|
||||
name = "\improper R&D server"
|
||||
desc = "A server which houses a back-up of all station research. It can be used to restore lost data, or to act as another point of retrieval."
|
||||
icon = 'icons/obj/machines/research.dmi'
|
||||
icon = 'icons/obj/machinery/research.dmi'
|
||||
icon_state = "server"
|
||||
var/datum/research/files
|
||||
var/health = 100
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/machinery/weapons_analyzer
|
||||
name = "weapons analyzer"
|
||||
desc = "A research device which can be used to put together modular energy weapons, or to gain knowledge about the effectiveness of various objects as weaponry."
|
||||
icon = 'icons/obj/machines/research.dmi'
|
||||
icon = 'icons/obj/machinery/research.dmi'
|
||||
icon_state = "weapon_analyzer"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
@@ -96,7 +96,7 @@
|
||||
|
||||
if(use_check_and_message(usr))
|
||||
return
|
||||
|
||||
|
||||
if(istype(item, /obj/item/device/laser_assembly))
|
||||
var/obj/item/device/laser_assembly/A = item
|
||||
A.ready_to_craft = FALSE
|
||||
@@ -164,7 +164,7 @@
|
||||
"shots modifier" = initial(l_component.shots), "burst modifier" = initial(l_component.burst), "accuracy modifier" = initial(l_component.accuracy), "repair tool" = l_repair_name
|
||||
)
|
||||
data["gun_mods"] = mods
|
||||
|
||||
|
||||
else if(istype(item, /obj/item/gun))
|
||||
var/obj/item/gun/gun = item
|
||||
data["name"] = gun.name
|
||||
@@ -264,7 +264,7 @@
|
||||
|
||||
if(item)
|
||||
var/icon/Icon_used = new /icon(item.icon, item.icon_state)
|
||||
ui.add_asset("icon", Icon_used)
|
||||
ui.add_asset("icon", Icon_used)
|
||||
ui.send_asset("icon")
|
||||
ui.open()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user