cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-26 14:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9121 from hex37/deconstructive-analyzer-tweak

Browse Source 
Deconstructive Analyzer Tweak
This commit is contained in:
Atermonera
2023-07-02 11:20:49 -08:00
committed by GitHub
parent b7048d890d e17ae8d5be
commit 82b79c6356
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/destructive_analyzer.dm
+2 -5
View File
@@ -61,11 +61,8 @@ Note: Must be placed within 3 tiles of the R&D Console
if(!loaded_item)
if(isrobot(user)) //Don't put your module items in there!
return
if(!O.origin_tech)
to_chat(user, "<span class='notice'>This doesn't seem to have a tech origin.</span>")
return
if(O.origin_tech.len == 0)
to_chat(user, "<span class='notice'>You cannot deconstruct this item.</span>")
if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38)) // Prevents ammo recycling exploit with speedloaders.
to_chat(user, "<span class='notice'>\The [O] is too hazardous to recycle with the autolathe!</span>")
return
busy = 1
loaded_item = O
code/modules/research/rdconsole.dm
+13 -7
View File
@@ -493,7 +493,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Updating Database..."
if(0.1)
dat += "Processing and Updating Database..."
if(linked_lathe)
dat += "Processing; Updating Database and Recycling Materials to Protolathe..."
else
dat += "Processing; Updating Database..."
if(0.2)
dat += "SYSTEM LOCKED<BR><BR>"
@@ -645,12 +648,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Name: [linked_destroy.loaded_item.name]<BR>"
dat += "Origin Tech:"
dat += "<UL>"
for(var/T in linked_destroy.loaded_item.origin_tech)
dat += "<LI>[CallTechName(T)] [linked_destroy.loaded_item.origin_tech[T]]"
for(var/datum/tech/F in files.known_tech)
if(F.name == CallTechName(T))
dat += " (Current: [F.level])"
break
if(!linked_destroy.loaded_item.origin_tech || linked_destroy.loaded_item.origin_tech.len == 0)
dat += "No Tech origin detected. Deconstruct anyway?"
else
for(var/T in linked_destroy.loaded_item.origin_tech)
dat += "<LI>[CallTechName(T)] [linked_destroy.loaded_item.origin_tech[T]]"
for(var/datum/tech/F in files.known_tech)
if(F.name == CallTechName(T))
dat += " (Current: [F.level])"
break
dat += "</UL>"
dat += "<HR><A href='?src=\ref[src];deconstruct=1'>Deconstruct Item</A> || "
dat += "<A href='?src=\ref[src];eject_item=1'>Eject Item</A> || "