cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)

Browse Source 
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.

---------

Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
This commit is contained in:
Cody Brittain
2026-02-01 05:14:26 +00:00
committed by GitHub
parent 75424095ac
commit 3f62424312
857 changed files with 8690 additions and 8599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal.dm
+10 -10
View File
@@ -134,8 +134,8 @@
/obj/machinery/disposal/proc/contents_count()
var/things = 0
for(var/thing in contents)
if(istype(thing, /obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/S = thing
if(istype(thing, /obj/item/assembly/signaler))
var/obj/item/assembly/signaler/S = thing
if(S.connected == wires)
continue
things++
@@ -216,9 +216,9 @@
user.visible_message("<b>[user]</b> pours [attacking_item] out into [src].", SPAN_NOTICE("You pour [attacking_item] out into [src]."))
return TRUE
else if (istype (attacking_item, /obj/item/device/lightreplacer))
else if (istype (attacking_item, /obj/item/lightreplacer))
var/count = 0
var/obj/item/device/lightreplacer/R = attacking_item
var/obj/item/lightreplacer/R = attacking_item
if (R.store_broken)
for(var/obj/item/light/L in R.contents)
count++
@@ -701,8 +701,8 @@
// now everything inside the disposal gets put into the holder
// note AM since can contain mobs or objs
for(var/atom/movable/AM in D)
if(istype(AM, /obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/S = AM
if(istype(AM, /obj/item/assembly/signaler))
var/obj/item/assembly/signaler/S = AM
if(S.connected == D.wires)
continue
AM.forceMove(src)
@@ -1326,8 +1326,8 @@
if(..())
return
if(istype(attacking_item, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = attacking_item
if(istype(attacking_item, /obj/item/destTagger))
var/obj/item/destTagger/O = attacking_item
if(O.currTag)// Tag set
sort_tag = O.currTag
@@ -1397,8 +1397,8 @@
if(..())
return
if(istype(attacking_item, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = attacking_item
if(istype(attacking_item, /obj/item/destTagger))
var/obj/item/destTagger/O = attacking_item
if(O.currTag)// Tag set
sortType = O.currTag
code/modules/recycling/sortingmachinery.dm
+9 -9
View File
@@ -38,8 +38,8 @@
qdel(src)
/obj/structure/bigDelivery/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = attacking_item
if(istype(attacking_item, /obj/item/destTagger))
var/obj/item/destTagger/O = attacking_item
if(O.currTag)
if(src.sortTag != O.currTag)
to_chat(user, SPAN_NOTICE("You have labeled the destination as [O.currTag]."))
@@ -153,8 +153,8 @@
return
/obj/item/smallDelivery/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = attacking_item
if(istype(attacking_item, /obj/item/destTagger))
var/obj/item/destTagger/O = attacking_item
if(O.currTag)
if(src.sortTag != O.currTag)
to_chat(user, SPAN_NOTICE("You have labeled the destination as [O.currTag]."))
@@ -247,10 +247,10 @@
AM.forceMove(T)
return ..()
/obj/item/device/destTagger
/obj/item/destTagger
name = "destination tagger"
desc = "Used to set the destination of properly wrapped packages."
icon = 'icons/obj/item/device/dest_tagger.dmi'
icon = 'icons/obj/item/dest_tagger.dmi'
icon_state = "dest_tagger"
var/currTag = 0
matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
@@ -258,7 +258,7 @@
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
/obj/item/device/destTagger/proc/openwindow(mob/user)
/obj/item/destTagger/proc/openwindow(mob/user)
var/dat = "<tt><center><h1><b>TagMaster 2.3</b></h1></center>"
var/ui_ref = REF(src)
@@ -274,11 +274,11 @@
user << browse(HTML_SKELETON(dat), "window=destTagScreen;size=450x375")
onclose(user, "destTagScreen")
/obj/item/device/destTagger/attack_self(mob/user)
/obj/item/destTagger/attack_self(mob/user)
openwindow(user)
return
/obj/item/device/destTagger/Topic(href, href_list)
/obj/item/destTagger/Topic(href, href_list)
src.add_fingerprint(usr)
if(href_list["nextTag"] && (html_decode(href_list["nextTag"]) in SSdisposals.tagger_locations))