ERROR: No Scanner detected!
"
-
- var/dat = "Scanner Functions
"
- dat += ""
-
- if(!scanner.occupant)
- dat += "Scanner Unoccupied"
- else if(loading)
- dat += "[scanner.occupant] => Scanning..."
- else
- if(scanner.occupant.ckey != scantemp_ckey)
- scantemp = "Ready to Scan"
- scantemp_ckey = scanner.occupant.ckey
- dat += "[scanner.occupant] => [scantemp]"
-
- dat += "
"
-
- if(scanner.occupant)
- dat += topic_link(src,"scan","Start Scan") + "
"
- if(scanner.locked)
- dat += topic_link(src,"lock","Unlock Scanner")
- else
- dat += topic_link(src,"lock","Lock Scanner")
- else
- dat += fake_link("Start Scan")
-
- // Footer
- dat += "Database Functions
"
- if(records.len > 0)
- dat += topic_link(src,"menu=2","View Records ([records.len])") + "
"
- else
- dat += fake_link("View Records (0)")
-
- if(has_disk)
- dat += topic_link(src,"eject_disk","Eject Disk") + "
"
- return dat
-
- proc/RecordsList()
- var/dat = "Current records
"
- to_chat(dat += topic_link(src,"menu=1",", Back") + "
")
- for(var/datum/data/record/R in records)
- dat += "[R.fields["name"]]
Scan ID [R.fields["id"]] " + topic_link(src,"view_rec=\ref[R]","View Record")
- return dat
-
- proc/ShowRecord()
- var/dat = "Selected Record
"
- to_chat(dat += topic_link(src,"menu=2",", Back") + "
")
-
- if(!active_record)
- dat += "Record not found."
- else
- dat += "[active_record.fields["name"]]
"
- dat += "Scan ID [active_record.fields["id"]] [topic_link(src,"clone","Clone")]
"
-
- var/obj/item/weapon/implant/health/H = locate(active_record.fields["imp"])
-
- if((H) && (istype(H)))
- dat += "Health Implant Data:
[H.sensehealth()]
"
- else
- dat += "Unable to locate Health Implant.
"
-
- dat += "Unique Identifier:
[active_record.fields["UI"]]
"
- dat += "Structural Enzymes:
[active_record.fields["SE"]]
"
-
- if(has_disk)
- dat += ""
- dat += "
Inserted Disk
"
- dat += "Contents: "
- if(computer.floppy.inserted.files.len == 0)
- dat += "Empty"
- else
- for(var/datum/file/data/genome/G in computer.floppy.inserted.files)
- dat += topic_link(src,"loadfile=\ref[G]","[G.name]") + "
"
-
- dat += "
Save to Disk:
"
- dat += topic_link(src,"save_disk=ue","Unique Identifier + Unique Enzymes") + "
"
- dat += topic_link(src,"save_disk=ui","Unique Identifier") + "
"
- dat += topic_link(src,"save_disk=se","Structural Enzymes") + "
"
- dat += ""
-
- dat += "[topic_link(src,"del_rec","Delete Record")]"
- return dat
- proc/ConfirmDelete()
- var/dat = "[temp]
"
- dat += "Confirm Record Deletion
"
-
- dat += "[topic_link(src,"del_rec","Scan card to confirm")]
"
- dat += "[topic_link(src,"menu=3","Cancel")]"
- return dat
-
- interact()
- if(!interactable())
- return
-
- updatemodules()
-
- var/dat = ""
- dat += topic_link(src,"refresh","Refresh")
- dat += "Cloning Pod Status
"
- dat += "[temp]
"
-
- has_disk = (computer.floppy && computer.floppy.inserted)
- if(!active_record && menu > 2)
- menu = 2
-
- switch(menu)
- if(1)
- dat += ScanningMenu()
-
- if(2)
- dat += RecordsList()
-
- if(3)
- dat += ShowRecord()
-
- if(4)
- dat = ConfirmDelete() // not (+=), this is how it used to be, just putting it in a function
-
- if(!popup)
- popup = new(usr, "\ref[computer]", "Cloning System Control")
- popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
-
- popup.set_content(dat)
- popup.open()
- return
-
- Topic(var/href, var/list/href_list)
- if(loading || !interactable())
- return
-
- if(href_list["menu"])
- menu = text2num(href_list["menu"])
- else if(("scan" in href_list) && !isnull(scanner))
- scantemp = ""
-
- loading = 1
- computer.updateUsrDialog()
-
- spawn(20)
- scan_mob(scanner.occupant)
-
- loading = 0
- computer.updateUsrDialog()
-
-
- //No locking an open scanner.
- else if(("lock" in href_list) && !isnull(scanner))
- if((!scanner.locked) && (scanner.occupant))
- scanner.locked = 1
- else
- scanner.locked = 0
-
- else if("view_rec" in href_list)
- active_record = locate(href_list["view_rec"])
- if(istype(active_record,/datum/data/record))
- if( !active_record.fields["ckey"] || active_record.fields["ckey"] == "" )
- del(active_record)
- temp = "Record Corrupt"
- else
- menu = 3
- else
- active_record = null
- temp = "Record missing."
-
- else if("del_rec" in href_list)
- if((!active_record) || (menu < 3))
- return
- if(menu == 3) //If we are viewing a record, confirm deletion
- temp = "Delete record?"
- menu = 4
-
- else if(menu == 4)
- var/obj/item/weapon/card/id/C = usr.get_active_hand()
- if(istype(C)||istype(C, /obj/item/device/pda))
- if(check_access(C))
- temp = "[active_record.fields["name"]] => Record deleted."
- records.Remove(active_record)
- del(active_record)
- menu = 2
- else
- temp = "Access Denied."
-
- else if("eject_disk" in href_list)
- if(computer.floppy)
- computer.floppy.eject_disk()
-
- else if("loadfile" in href_list)
-
- var/datum/file/data/genome/G = locate(href_list["loadfile"]) in computer.floppy.files
- if(!istype(G))
- temp = "Load error."
- computer.updateUsrDialog()
- return
- switch(G.type)
- if(/datum/file/data/genome/UI)
- active_record.fields["UI"] = G.content
- if(/datum/file/data/genome/UE)
- active_record.fields["name"] = G.real_name
- if(/datum/file/data/genome/SE)
- active_record.fields["SE"] = G.content
- if(/datum/file/data/genome/cloning)
- active_record = G:record
- else if("savefile" in href_list)
- if(!active_record || !computer || !computer.floppy)
- temp = "Save error."
- computer.updateUsrDialog()
- return
- var/rval = 0
- switch(href_list["save_disk"])
- if("ui")
- var/datum/file/data/genome/UI/ui = new
- ui.content = active_record.fields["UI"]
- ui.real_name = active_record.fields["name"]
- rval = computer.floppy.addfile(ui)
- if("ue")
- var/datum/file/data/genome/UI/UE/ui = new
- ui.content = active_record.fields["UI"]
- ui.real_name = active_record.fields["name"]
- rval = computer.floppy.addfile(ui)
- if("se")
- var/datum/file/data/genome/SE/se = new
- se.content = active_record.fields["SE"]
- se.real_name = active_record.fields["name"]
- rval = computer.floppy.addfile(se)
- if("clone")
- var/datum/file/data/genome/cloning/c = new
- c.record = active_record
- c.real_name = active_record.fields["name"]
- rval = computer.floppy.addfile(c)
- if(!rval)
- temp = "Disk write error."
-
- else if("refresh" in href_list)
- computer.updateUsrDialog()
-
- else if("clone" in href_list)
- //Look for that player! They better be dead!
- if(active_record)
- //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
- if(!pod1)
- temp = "No Clonepod detected."
- else if(pod1.occupant)
- temp = "Clonepod is currently occupied."
- else if(pod1.mess)
- temp = "Clonepod malfunction."
- else if(!config.revival_cloning)
- temp = "Unable to initiate cloning cycle."
- else if(pod1.growclone(active_record.fields["ckey"], active_record.fields["name"], active_record.fields["UI"], active_record.fields["SE"], active_record.fields["mind"], active_record.fields["mrace"]))
- temp = "[active_record.fields["name"]] => Cloning cycle in progress..."
- records.Remove(active_record)
- del(active_record)
- menu = 1
- else
- temp = "[active_record.fields["name"]] => Initialisation failure."
-
- else
- temp = "Data corruption."
-
- computer.add_fingerprint(usr)
- computer.updateUsrDialog()
- return
-
- proc/scan_mob(mob/living/carbon/human/subject as mob)
- if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna))
- scantemp = "Unable to locate valid genetic data."
- return
- if(!getbrain(subject))
- scantemp = "No signs of intelligence detected."
- return
- if(subject.suiciding == 1)
- scantemp = "Subject's brain is not responding to scanning stimuli."
- return
- if((!subject.ckey) || (!subject.client))
- scantemp = "Mental interface failure."
- return
- if(NOCLONE in subject.mutations)
- scantemp = "Mental interface failure."
- return
- if(!isnull(find_record(subject.ckey)))
- scantemp = "Subject already in database."
- return
-
- subject.dna.check_integrity()
-
- var/datum/data/record/R = new /datum/data/record( )
- if(subject.dna)
- R.fields["mrace"] = subject.dna.mutantrace
- R.fields["UI"] = subject.dna.uni_identity
- R.fields["SE"] = subject.dna.struc_enzymes
- else
- R.fields["mrace"] = null
- R.fields["UI"] = null
- R.fields["SE"] = null
- R.fields["ckey"] = subject.ckey
- R.fields["name"] = subject.real_name
- R.fields["id"] = copytext(md5(subject.real_name), 2, 6)
-
-
-
- //Add an implant if needed
- var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject)
- if(isnull(imp))
- imp = new /obj/item/weapon/implant/health(subject)
- imp.implanted = subject
- R.fields["imp"] = "\ref[imp]"
- //Update it if needed
- else
- R.fields["imp"] = "\ref[imp]"
-
- if(!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
- R.fields["mind"] = "\ref[subject.mind]"
-
- records += R
- scantemp = "Subject successfully scanned."
-
-//Find a specific record by key.
- proc/find_record(var/find_key)
- for(var/datum/data/record/R in records)
- if(R.fields["ckey"] == find_key)
- return R
- return null
diff --git a/code/modules/computer3/computers/prisonshuttle.dm b/code/modules/computer3/computers/prisonshuttle.dm
deleted file mode 100644
index e7dd5c650ac..00000000000
--- a/code/modules/computer3/computers/prisonshuttle.dm
+++ /dev/null
@@ -1,242 +0,0 @@
-//Config stuff
-#define PRISON_MOVETIME 150 //Time to station is milliseconds.
-#define PRISON_STATION_AREATYPE "/area/shuttle/prison/station" //Type of the prison shuttle area for station
-#define PRISON_DOCK_AREATYPE "/area/shuttle/prison/prison" //Type of the prison shuttle area for dock
-
-var/prison_shuttle_moving_to_station = 0
-var/prison_shuttle_moving_to_prison = 0
-var/prison_shuttle_at_station = 0
-var/prison_shuttle_can_send = 1
-var/prison_shuttle_time = 0
-var/prison_shuttle_timeleft = 0
-
-/obj/machinery/computer3/prison_shuttle
- name = "Prison Shuttle Console"
- icon = 'icons/obj/computer.dmi'
- icon_state = "shuttle"
- req_access = list(access_security)
- circuit = "/obj/item/part/board/circuit/prison_shuttle"
- var/temp = null
- var/hacked = 0
- var/allowedtocall = 0
- var/prison_break = 0
-
-
- attackby(I as obj, user as mob, params)
- return src.attack_hand(user)
-
-
- attack_ai(var/mob/user as mob)
- return src.attack_hand(user)
-
-
- attack_paw(var/mob/user as mob)
- return src.attack_hand(user)
-
-
- attackby(I as obj, user as mob, params)
- if(istype(I, /obj/item/tool/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- if(do_after(user, 20, target = src))
- var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
- var/obj/item/part/board/circuit/prison_shuttle/M = new /obj/item/part/board/circuit/prison_shuttle( A )
- for(var/obj/C in src)
- C.loc = src.loc
- A.circuit = M
- A.anchored = 1
-
- if(src.stat & BROKEN)
- to_chat(user, "\blue The broken glass falls out.")
- new /obj/item/trash/shard( src.loc )
- A.state = 3
- A.icon_state = "3"
- else
- to_chat(user, "\blue You disconnect the monitor.")
- A.state = 4
- A.icon_state = "4"
-
- del(src)
- else if(istype(I,/obj/item/card/emag) && (!hacked))
- hacked = 1
- to_chat(user, "\blue You disable the lock.")
- else
- return src.attack_hand(user)
-
-
- attack_hand(var/mob/user as mob)
- if(!src.allowed(user) && (!hacked))
- to_chat(user, "\red Access Denied.")
- return
- if(prison_break)
- to_chat(user, "\red Unable to locate shuttle.")
- return
- if(..())
- return
- user.set_machine(src)
- post_signal("prison")
- var/dat
- if(src.temp)
- dat = src.temp
- else
- dat += {"Location: [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"]
- [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*
\n
":prison_shuttle_at_station ? "\nSend to Dock
\n
":"\nSend to Station
\n
"]
- \nClose"}
-
- //user << browse(dat, "window=computer;size=575x450")
- //onclose(user, "computer")
- var/datum/browser/popup = new(user, "computer", name, 575, 450)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
- return
-
-
- Topic(href, href_list)
- if(..())
- return
-
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
- usr.set_machine(src)
-
- if(href_list["sendtodock"])
- if(!prison_can_move())
- to_chat(usr, "\red The prison shuttle is unable to leave.")
- return
- if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
- post_signal("prison")
- to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")
- src.temp += "Shuttle sent.
OK"
- src.updateUsrDialog()
- prison_shuttle_moving_to_prison = 1
- prison_shuttle_time = world.timeofday + PRISON_MOVETIME
- spawn(0)
- prison_process()
-
- else if(href_list["sendtostation"])
- if(!prison_can_move())
- to_chat(usr, "\red The prison shuttle is unable to leave.")
- return
- if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
- post_signal("prison")
- to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")
- src.temp += "Shuttle sent.
OK"
- src.updateUsrDialog()
- prison_shuttle_moving_to_station = 1
- prison_shuttle_time = world.timeofday + PRISON_MOVETIME
- spawn(0)
- prison_process()
-
- else if(href_list["mainmenu"])
- src.temp = null
-
- src.add_fingerprint(usr)
- src.updateUsrDialog()
- return
-
-
- proc/prison_can_move()
- if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return 0
- else return 1
-
-/*
- proc/prison_break()
- switch(prison_break)
- if(0)
- if(!prison_shuttle_at_station || prison_shuttle_moving_to_prison) return
-
- prison_shuttle_moving_to_prison = 1
- prison_shuttle_at_station = prison_shuttle_at_station
-
- if(!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station)
- prison_shuttle_time = world.timeofday + PRISON_MOVETIME
- spawn(0)
- prison_process()
- prison_break = 1
- if(1)
- prison_break = 0
-*/
-
- proc/post_signal(var/command)
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(1311)
- if(!frequency) return
- var/datum/signal/status_signal = new
- status_signal.source = src
- status_signal.transmission_method = 1
- status_signal.data["command"] = command
- frequency.post_signal(src, status_signal)
- return
-
-
- proc/prison_process()
- while(prison_shuttle_time - world.timeofday > 0)
- var/ticksleft = prison_shuttle_time - world.timeofday
-
- if(ticksleft > 1e5)
- prison_shuttle_time = world.timeofday + 10 // midnight rollover
-
- prison_shuttle_timeleft = (ticksleft / 10)
- sleep(5)
- prison_shuttle_moving_to_station = 0
- prison_shuttle_moving_to_prison = 0
-
- switch(prison_shuttle_at_station)
-
- if(0)
- prison_shuttle_at_station = 1
- if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
-
- if(!prison_can_move())
- to_chat(usr, "\red The prison shuttle is unable to leave.")
- return
-
- var/area/start_location = locate(/area/shuttle/prison/prison)
- var/area/end_location = locate(/area/shuttle/prison/station)
-
- var/list/dstturfs = list()
- var/throwy = world.maxy
-
- for(var/turf/T in end_location)
- dstturfs += T
- if(T.y < throwy)
- throwy = T.y
- // hey you, get out of the way!
- for(var/turf/T in dstturfs)
- // find the turf to move things to
- var/turf/D = locate(T.x, throwy - 1, 1)
- //var/turf/E = get_step(D, SOUTH)
- for(var/atom/movable/AM as mob|obj in T)
- AM.Move(D)
- if(istype(T, /turf/simulated))
- del(T)
- start_location.move_contents_to(end_location)
-
- if(1)
- prison_shuttle_at_station = 0
- if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
-
- if(!prison_can_move())
- to_chat(usr, "\red The prison shuttle is unable to leave.")
- return
-
- var/area/start_location = locate(/area/shuttle/prison/station)
- var/area/end_location = locate(/area/shuttle/prison/prison)
-
- var/list/dstturfs = list()
- var/throwy = world.maxy
-
- for(var/turf/T in end_location)
- dstturfs += T
- if(T.y < throwy)
- throwy = T.y
-
- // hey you, get out of the way!
- for(var/turf/T in dstturfs)
- // find the turf to move things to
- var/turf/D = locate(T.x, throwy - 1, 1)
- //var/turf/E = get_step(D, SOUTH)
- for(var/atom/movable/AM as mob|obj in T)
- AM.Move(D)
- if(istype(T, /turf/simulated))
- del(T)
- start_location.move_contents_to(end_location)
- return
\ No newline at end of file
diff --git a/code/modules/computer3/computers/shuttle.dm b/code/modules/computer3/computers/shuttle.dm
deleted file mode 100644
index 70bdb133137..00000000000
--- a/code/modules/computer3/computers/shuttle.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- This may not migrate to C3. It's basically a machine in the guise of a computer;
- there is nothing interactive about it.
-*/
-
-/obj/machinery/computer3/shuttle
- name = "Shuttle"
- desc = "For shuttle control."
- icon_state = "shuttle"
- var/auth_need = 3.0
- var/list/authorized = list( )
-
-
- attackby(var/obj/item/card/W as obj, var/mob/user as mob, params)
- if(stat & (BROKEN|NOPOWER)) return
- if((!( istype(W, /obj/item/card) ) || !( ticker ) || emergency_shuttle.location != 1 || !( user ))) return
- if(istype(W, /obj/item/card/id)||istype(W, /obj/item/device/pda))
- if(istype(W, /obj/item/device/pda))
- var/obj/item/device/pda/pda = W
- W = pda.id
- if(!W:access) //no access
- to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
- return
-
- var/list/cardaccess = W:access
- if(!istype(cardaccess, /list) || !cardaccess.len) //no access
- to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
- return
-
- if(!(access_heads in W:access)) //doesn't have this access
- to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
- return 0
-
- var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
- if(emergency_shuttle.location != 1 && user.get_active_hand() != W)
- return 0
- switch(choice)
- if("Authorize")
- src.authorized -= W:registered_name
- src.authorized += W:registered_name
- if(src.auth_need - src.authorized.len > 0)
- message_admins("[key_name_admin(user)] has authorized early shuttle launch")
- log_game("[user.ckey] has authorized early shuttle launch")
- to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len))
- else
- message_admins("[key_name_admin(user)] has launched the shuttle")
- log_game("[user.ckey] has launched the shuttle early")
- to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!")
- emergency_shuttle.online = 1
- emergency_shuttle.settimeleft(10)
- //src.authorized = null
- del(src.authorized)
- src.authorized = list( )
-
- if("Repeal")
- src.authorized -= W:registered_name
- to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len))
-
- if("Abort")
- to_chat(world, "\blue All authorizations to shorting time for shuttle launch have been revoked!")
- src.authorized.len = 0
- src.authorized = list( )
- return
-
- emag_act(user as mob)
- if(!emagged)
- var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel")
-
- if(!emagged && emergency_shuttle.location == 1)
- switch(choice)
- if("Launch")
- to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!")
- emergency_shuttle.settimeleft( 10 )
- emagged = 1
- if("Cancel")
- return
diff --git a/code/modules/computer3/computers/specops_shuttle.dm b/code/modules/computer3/computers/specops_shuttle.dm
deleted file mode 100644
index fa64036857d..00000000000
--- a/code/modules/computer3/computers/specops_shuttle.dm
+++ /dev/null
@@ -1,246 +0,0 @@
-//Config stuff
-#define SPECOPS_MOVETIME 600 //Time to station is milliseconds. 60 seconds, enough time for everyone to be on the shuttle before it leaves.
-#define SPECOPS_STATION_AREATYPE "/area/shuttle/specops/station" //Type of the spec ops shuttle area for station
-#define SPECOPS_DOCK_AREATYPE "/area/shuttle/specops/centcom" //Type of the spec ops shuttle area for dock
-
-var/specops_shuttle_moving_to_station = 0
-var/specops_shuttle_moving_to_centcom = 0
-var/specops_shuttle_at_station = 0
-var/specops_shuttle_can_send = 1
-var/specops_shuttle_time = 0
-var/specops_shuttle_timeleft = 0
-
-/obj/machinery/computer3/specops_shuttle
- name = "Spec. Ops. Shuttle Console"
- icon = 'icons/obj/computer.dmi'
- icon_state = "shuttle"
- req_access = list(access_cent_specops)
- var/temp = null
- var/hacked = 0
- var/allowedtocall = 0
-
-/proc/specops_process()
- var/area/centcom/control/cent_com = locate()//To find announcer. This area should exist for this proc to work.
- var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
- var/mob/living/silicon/decoy/announcer = locate() in cent_com//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
-
- var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
- var/message = "THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH"//Initial message shown.
- if(announcer)
- announcer.say(message)
- message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD"
- announcer.say(message)
-
- while(specops_shuttle_time - world.timeofday > 0)
- var/ticksleft = specops_shuttle_time - world.timeofday
-
- if(ticksleft > 1e5)
- specops_shuttle_time = world.timeofday + 10 // midnight rollover
- specops_shuttle_timeleft = (ticksleft / 10)
-
- //All this does is announce the time before launch.
- if(announcer)
- var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions.
- if(rounded_time_left in message_tracker)//If that time is in the list for message announce.
- message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN"
- if(rounded_time_left==0)
- message = "ALERT: TAKEOFF"
- announcer.say(message)
- message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
- //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.
-
- sleep(5)
-
- specops_shuttle_moving_to_station = 0
- specops_shuttle_moving_to_centcom = 0
-
- specops_shuttle_at_station = 1
- if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
-
- if(!specops_can_move())
- to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
- return
-
- //Begin Marauder launchpad.
- spawn(0)//So it parallel processes it.
- for(var/obj/machinery/door/poddoor/M in special_ops)
- switch(M.id)
- if("ASSAULT0")
- spawn(10)//1 second delay between each.
- M.open()
- if("ASSAULT1")
- spawn(20)
- M.open()
- if("ASSAULT2")
- spawn(30)
- M.open()
- if("ASSAULT3")
- spawn(40)
- M.open()
-
- sleep(10)
-
- var/spawn_marauder[] = new()
- for(var/obj/effect/landmark/L in landmarks_list)
- if(L.name == "Marauder Entry")
- spawn_marauder.Add(L)
- for(var/obj/effect/landmark/L in landmarks_list)
- if(L.name == "Marauder Exit")
- var/obj/effect/portal/P = new(L.loc)
- P.invisibility = 101//So it is not seen by anyone.
- P.failchance = 0//So it has no fail chance when teleporting.
- P.target = pick(spawn_marauder)//Where the marauder will arrive.
- spawn_marauder.Remove(P.target)
-
- sleep(10)
-
- for(var/obj/machinery/mass_driver/M in special_ops)
- switch(M.id)
- if("ASSAULT0")
- spawn(10)
- M.drive()
- if("ASSAULT1")
- spawn(20)
- M.drive()
- if("ASSAULT2")
- spawn(30)
- M.drive()
- if("ASSAULT3")
- spawn(40)
- M.drive()
-
- sleep(50)//Doors remain open for 5 seconds.
-
- for(var/obj/machinery/door/poddoor/M in special_ops)
- switch(M.id)//Doors close at the same time.
- if("ASSAULT0")
- spawn(0)
- M.close()
- if("ASSAULT1")
- spawn(0)
- M.close()
- if("ASSAULT2")
- spawn(0)
- M.close()
- if("ASSAULT3")
- spawn(0)
- M.close()
- special_ops.readyreset()//Reset firealarm after the team launched.
- //End Marauder launchpad.
-
- var/area/start_location = locate(/area/shuttle/specops/centcom)
- var/area/end_location = locate(/area/shuttle/specops/station)
-
- var/list/dstturfs = list()
- var/throwy = world.maxy
-
- for(var/turf/T in end_location)
- dstturfs += T
- if(T.y < throwy)
- throwy = T.y
-
- // hey you, get out of the way!
- for(var/turf/T in dstturfs)
- // find the turf to move things to
- var/turf/D = locate(T.x, throwy - 1, 1)
- //var/turf/E = get_step(D, SOUTH)
- for(var/atom/movable/AM as mob|obj in T)
- AM.Move(D)
- if(istype(T, /turf/simulated))
- del(T)
-
- start_location.move_contents_to(end_location)
-
- for(var/turf/T in get_area_turfs(end_location) )
- var/mob/M = locate(/mob) in T
- to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
-
-/proc/specops_can_move()
- if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0
- else return 1
-
-/obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params)
- return attack_hand(user)
-
-/obj/machinery/computer3/specops_shuttle/attack_ai(var/mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/specops_shuttle/attack_paw(var/mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params)
- if(istype(I,/obj/item/card/emag))
- to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
- else
- return attack_hand(user)
-
-/obj/machinery/computer3/specops_shuttle/attack_hand(var/mob/user as mob)
- if(!allowed(user))
- to_chat(user, "\red Access Denied.")
- return
-
- if(sent_strike_team == 0)
- to_chat(usr, "\red The strike team has not yet deployed.")
- return
-
- if(..())
- return
-
- user.set_machine(src)
- var/dat
- if(temp)
- dat = temp
- else
- dat += {"
- Location: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"]
- \nClose"}
-
- //user << browse(dat, "window=computer;size=575x450")
- //onclose(user, "computer")
- var/datum/browser/popup = new(user, "computer", "Special Operations Shuttle", 575, 450)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
- return
-
-/obj/machinery/computer3/specops_shuttle/Topic(href, href_list)
- if(..())
- return
-
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
- usr.set_machine(src)
-
- if(href_list["sendtodock"])
- if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
-
- to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.")
- return
-
- else if(href_list["sendtostation"])
- if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
-
- if(!specops_can_move())
- to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
- return
-
- to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.")
-
- temp += "Shuttle departing.
OK"
- updateUsrDialog()
-
- var/area/centcom/specops/special_ops = locate()
- if(special_ops)
- special_ops.readyalert()//Trigger alarm for the spec ops area.
- specops_shuttle_moving_to_station = 1
-
- specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME
- spawn(0)
- specops_process()
-
- else if(href_list["mainmenu"])
- temp = null
-
- add_fingerprint(usr)
- updateUsrDialog()
- return
\ No newline at end of file
diff --git a/code/modules/computer3/computers/syndicate_shuttle.dm b/code/modules/computer3/computers/syndicate_shuttle.dm
deleted file mode 100644
index 5585f4fff0a..00000000000
--- a/code/modules/computer3/computers/syndicate_shuttle.dm
+++ /dev/null
@@ -1,103 +0,0 @@
-#define SYNDICATE_SHUTTLE_MOVE_TIME 240
-#define SYNDICATE_SHUTTLE_COOLDOWN 200
-
-/obj/machinery/computer3/syndicate_station
- name = "syndicate shuttle terminal"
- icon = 'icons/obj/computer.dmi'
- icon_state = "syndishuttle"
- req_access = list(access_syndicate)
- var/area/curr_location
- var/moving = 0
- var/lastMove = 0
-
-
-/obj/machinery/computer3/syndicate_station/New()
- curr_location= locate(/area/syndicate_station/start)
-
-
-/obj/machinery/computer3/syndicate_station/proc/syndicate_move_to(area/destination as area)
- if(moving) return
- if(lastMove + SYNDICATE_SHUTTLE_COOLDOWN > world.time) return
- var/area/dest_location = locate(destination)
- if(curr_location == dest_location) return
-
- moving = 1
- lastMove = world.time
-
- if(curr_location.z != dest_location.z)
- var/area/transit_location = locate(/area/syndicate_station/transit)
- curr_location.move_contents_to(transit_location)
- curr_location = transit_location
- sleep(SYNDICATE_SHUTTLE_MOVE_TIME)
-
- curr_location.move_contents_to(dest_location)
- curr_location = dest_location
- moving = 0
- return 1
-
-
-/obj/machinery/computer3/syndicate_station/attackby(obj/item/I as obj, mob/user as mob, params)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_station/attack_ai(mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_station/attack_paw(mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_station/attack_hand(mob/user as mob)
- if(!allowed(user))
- to_chat(user, "\red Access Denied")
- return
-
- user.set_machine(src)
-
- var/dat = {"Location: [curr_location]
- Ready to move[max(lastMove + SYNDICATE_SHUTTLE_COOLDOWN - world.time, 0) ? " in [max(round((lastMove + SYNDICATE_SHUTTLE_COOLDOWN - world.time) * 0.1), 0)] seconds" : ": now"]
- Syndicate Space
- North West of SS13 |
- North of SS13 |
- North East of SS13
- South West of SS13 |
- South of SS13 |
- South East of SS13
- North East of the Mining Asteroid
- Close"}
-
- user << browse(dat, "window=computer;size=575x450")
- onclose(user, "computer")
- return
-
-
-/obj/machinery/computer3/syndicate_station/Topic(href, href_list)
- if(!isliving(usr)) return
- var/mob/living/user = usr
-
- if(in_range(src, user) || istype(user, /mob/living/silicon))
- user.set_machine(src)
-
- if(href_list["syndicate"])
- syndicate_move_to(/area/syndicate_station/start)
- else if(href_list["station_nw"])
- syndicate_move_to(/area/syndicate_station/northwest)
- else if(href_list["station_n"])
- syndicate_move_to(/area/syndicate_station/north)
- else if(href_list["station_ne"])
- syndicate_move_to(/area/syndicate_station/northeast)
- else if(href_list["station_sw"])
- syndicate_move_to(/area/syndicate_station/southwest)
- else if(href_list["station_s"])
- syndicate_move_to(/area/syndicate_station/south)
- else if(href_list["station_se"])
- syndicate_move_to(/area/syndicate_station/southeast)
-// else if(href_list["commssat"])
-// syndicate_move_to(/area/syndicate_station/commssat)
- else if(href_list["mining"])
- syndicate_move_to(/area/syndicate_station/mining)
-
- add_fingerprint(usr)
- updateUsrDialog()
- return
-
-/obj/machinery/computer3/syndicate_station/bullet_act(var/obj/item/projectile/Proj)
- visible_message("[Proj] ricochets off [src]!") //let's not let them fuck themselves in the rear
\ No newline at end of file
diff --git a/code/modules/computer3/computers/syndicate_specops_shuttle.dm b/code/modules/computer3/computers/syndicate_specops_shuttle.dm
deleted file mode 100644
index c9a61b2dfad..00000000000
--- a/code/modules/computer3/computers/syndicate_specops_shuttle.dm
+++ /dev/null
@@ -1,259 +0,0 @@
-//Config stuff
-#define SYNDICATE_ELITE_MOVETIME 600 //Time to station is deciseconds. 60 seconds, enough time for everyone to be on the shuttle before it leaves.
-#define SYNDICATE_ELITE_STATION_AREATYPE "/area/shuttle/syndicate_elite/station" //Type of the spec ops shuttle area for station
-#define SYNDICATE_ELITE_DOCK_AREATYPE "/area/shuttle/syndicate_elite/mothership" //Type of the spec ops shuttle area for dock
-
-var/syndicate_elite_shuttle_moving_to_station = 0
-var/syndicate_elite_shuttle_moving_to_mothership = 0
-var/syndicate_elite_shuttle_at_station = 0
-var/syndicate_elite_shuttle_can_send = 1
-var/syndicate_elite_shuttle_time = 0
-var/syndicate_elite_shuttle_timeleft = 0
-
-/obj/machinery/computer3/syndicate_elite_shuttle
- name = "Elite Syndicate Squad Shuttle Console"
- icon = 'icons/obj/computer.dmi'
- icon_state = "syndishuttle"
- req_access = list(access_cent_specops)
- var/temp = null
- var/hacked = 0
- var/allowedtocall = 0
-
-/proc/syndicate_elite_process()
- var/area/syndicate_mothership/control/syndicate_ship = locate()//To find announcer. This area should exist for this proc to work.
- var/area/syndicate_mothership/elite_squad/elite_squad = locate()//Where is the specops area located?
- var/mob/living/silicon/decoy/announcer = locate() in syndicate_ship//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
-
- var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
- var/message = "THE SYNDICATE ELITE SHUTTLE IS PREPARING FOR LAUNCH"//Initial message shown.
- if(announcer)
- announcer.say(message)
- // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD"
- // announcer.say(message)
-
- while(syndicate_elite_shuttle_time - world.timeofday > 0)
- var/ticksleft = syndicate_elite_shuttle_time - world.timeofday
-
- if(ticksleft > 1e5)
- syndicate_elite_shuttle_time = world.timeofday // midnight rollover
- syndicate_elite_shuttle_timeleft = (ticksleft / 10)
-
- //All this does is announce the time before launch.
- if(announcer)
- var/rounded_time_left = round(syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions.
- if(rounded_time_left in message_tracker)//If that time is in the list for message announce.
- message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN"
- if(rounded_time_left==0)
- message = "ALERT: TAKEOFF"
- announcer.say(message)
- message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
- //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.
-
- sleep(5)
-
- syndicate_elite_shuttle_moving_to_station = 0
- syndicate_elite_shuttle_moving_to_mothership = 0
-
- syndicate_elite_shuttle_at_station = 1
- if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
-
- if(!syndicate_elite_can_move())
- to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
- return
-
- sleep(600)
-/*
- //Begin Marauder launchpad.
- spawn(0)//So it parallel processes it.
- for(var/obj/machinery/door/poddoor/M in elite_squad)
- switch(M.id)
- if("ASSAULT0")
- spawn(10)//1 second delay between each.
- M.open()
- if("ASSAULT1")
- spawn(20)
- M.open()
- if("ASSAULT2")
- spawn(30)
- M.open()
- if("ASSAULT3")
- spawn(40)
- M.open()
-
- sleep(10)
-
- var/spawn_marauder[] = new()
- for(var/obj/effect/landmark/L in landmarks_list)
- if(L.name == "Marauder Entry")
- spawn_marauder.Add(L)
- for(var/obj/effect/landmark/L in landmarks_list)
- if(L.name == "Marauder Exit")
- var/obj/effect/portal/P = new(L.loc)
- P.invisibility = 101//So it is not seen by anyone.
- P.failchance = 0//So it has no fail chance when teleporting.
- P.target = pick(spawn_marauder)//Where the marauder will arrive.
- spawn_marauder.Remove(P.target)
-
- sleep(10)
-
- for(var/obj/machinery/mass_driver/M in elite_squad)
- switch(M.id)
- if("ASSAULT0")
- spawn(10)
- M.drive()
- if("ASSAULT1")
- spawn(20)
- M.drive()
- if("ASSAULT2")
- spawn(30)
- M.drive()
- if("ASSAULT3")
- spawn(40)
- M.drive()
-
- sleep(50)//Doors remain open for 5 seconds.
-
- for(var/obj/machinery/door/poddoor/M in elite_squad)
- switch(M.id)//Doors close at the same time.
- if("ASSAULT0")
- spawn(0)
- M.close()
- if("ASSAULT1")
- spawn(0)
- M.close()
- if("ASSAULT2")
- spawn(0)
- M.close()
- if("ASSAULT3")
- spawn(0)
- M.close()
- */
- elite_squad.readyreset()//Reset firealarm after the team launched.
- //End Marauder launchpad.
-/*
- var/obj/explosionmarker = locate("Syndicate Breach Area")
- if(explosionmarker)
- var/turf/simulated/T = explosionmarker.loc
- if(T)
- explosion(T,4,6,8,10,0)
-
- sleep(40)
-// proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
-
-*/
- var/area/start_location = locate(/area/shuttle/syndicate_elite/mothership)
- var/area/end_location = locate(/area/shuttle/syndicate_elite/station)
-
- var/list/dstturfs = list()
- var/throwy = world.maxy
-
- for(var/turf/T in end_location)
- dstturfs = T
- if(T.y < throwy)
- throwy = T.y
-
- // hey you, get out of the way!
- for(var/turf/T in dstturfs)
- // find the turf to move things to
- var/turf/D = locate(T.x, throwy - 1, 1)
- //var/turf/E = get_step(D, SOUTH)
- for(var/atom/movable/AM as mob|obj in T)
- AM.Move(D)
- if(istype(T, /turf/simulated))
- del(T)
-
- start_location.move_contents_to(end_location)
-
- for(var/turf/T in get_area_turfs(end_location) )
- var/mob/M = locate(/mob) in T
- to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
-
-/proc/syndicate_elite_can_move()
- if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
- else return 1
-
-/obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_elite_shuttle/attack_ai(var/mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_elite_shuttle/attack_paw(var/mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
- if(istype(I,/obj/item/card/emag))
- to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
- else
- return attack_hand(user)
-
-/obj/machinery/computer3/syndicate_elite_shuttle/attack_hand(var/mob/user as mob)
- if(!allowed(user))
- to_chat(user, "\red Access Denied.")
- return
-
-// if(sent_syndicate_strike_team == 0)
-// to_chat(usr, "\red The strike team has not yet deployed.")
-// return
-
- if(..())
- return
-
- user.set_machine(src)
- var/dat
- if(temp)
- dat = temp
- else
- dat = {"Location: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"]
- \nClose"}
-
- //user << browse(dat, "window=computer;size=575x450")
- //onclose(user, "computer")
- var/datum/browser/popup = new(user, "computer", "Special Operations Shuttle", 575, 450)
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
- return
-
-/obj/machinery/computer3/syndicate_elite_shuttle/Topic(href, href_list)
- if(..())
- return
-
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
- usr.set_machine(src)
-
- if(href_list["sendtodock"])
- if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
-
- to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.")
- return
-
- else if(href_list["sendtostation"])
- if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
-
- if(!specops_can_move())
- to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
- return
-
- to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.")
-
- temp = "Shuttle departing.
OK"
- updateUsrDialog()
-
- var/area/syndicate_mothership/elite_squad/elite_squad = locate()
- if(elite_squad)
- elite_squad.readyalert()//Trigger alarm for the spec ops area.
- syndicate_elite_shuttle_moving_to_station = 1
-
- syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME
- spawn(0)
- syndicate_elite_process()
-
-
- else if(href_list["mainmenu"])
- temp = null
-
- add_fingerprint(usr)
- updateUsrDialog()
- return
\ No newline at end of file
diff --git a/code/modules/events/holidays/Christmas.dm b/code/modules/events/holidays/Christmas.dm
index 16fa1fb85f1..e3772fa78b5 100644
--- a/code/modules/events/holidays/Christmas.dm
+++ b/code/modules/events/holidays/Christmas.dm
@@ -14,7 +14,7 @@
evil_tree.icon_living = evil_tree.icon_state
evil_tree.icon_dead = evil_tree.icon_state
evil_tree.icon_gib = evil_tree.icon_state
- del(xmas)
+ qdel(xmas)
/obj/item/weapon/toy/xmas_cracker
name = "xmas cracker"
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index cb5155358a2..398994f972d 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -16,7 +16,7 @@
if(is_station_level(T.z))
pick_turfs += T
- for(var/i = 1, i <= number_of_wormholes, i++)
+ for(var/i in 1 to number_of_wormholes)
var/turf/T = pick(pick_turfs)
wormholes += new /obj/effect/portal/wormhole(T, null, null, -1)
@@ -30,9 +30,8 @@
if(T) O.loc = T
/datum/event/wormholes/end()
- portals.Remove(wormholes)
for(var/obj/effect/portal/wormhole/O in wormholes)
- O.loc = null
+ qdel(O)
wormholes.Cut()
diff --git a/code/modules/garbage_collection/__gc_info.dm b/code/modules/garbage_collection/__gc_info.dm
index 96e3a0ea8dc..be72097a8c9 100644
--- a/code/modules/garbage_collection/__gc_info.dm
+++ b/code/modules/garbage_collection/__gc_info.dm
@@ -43,9 +43,8 @@ that can't be. There are two main procs involved in this process:
/datum/proc/Destroy()
This is, effectively, a replacement for Del() (with some exceptions) which is also responsible for nulling out
- references to or on the object it is called on. Like Del, the Destroy proc will always be called, even if the object
- is getting destroyed by a direct del instead of qdel; in that case, isnull(gcDestroyed) will be true, and some
- references can safely be ignored.
+ references to or on the object it is called on. Unlike Del, the Destroy proc will only be called by qdel; generally,
+ this should only happen to datums that are no longer referenced by anything, which shouldn't be an issue.
The exceptions where Destroy cannot replace Del are for the same non-datum types mentioned under qdel, above. Those
should use a Del proc for any necessary cleanup, as a Destroy proc on them will not automatically get called.
diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm
index 95535376f85..29db9198ae4 100644
--- a/code/modules/garbage_collection/garbage_collector.dm
+++ b/code/modules/garbage_collection/garbage_collector.dm
@@ -92,12 +92,13 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
if(isnull(D))
return
- if(isnull(garbageCollector))
+ if(!istype(D)) // A non-datum was passed into qdel - just delete it outright.
+ // warning("qdel() passed object of type [D.type]. qdel() can only handle /datum/ types.")
del(D)
return
- if(!istype(D)) // A non-datum was passed into qdel - just delete it outright.
- // warning("qdel() passed object of type [D.type]. qdel() can only handle /datum/ types.")
+ if(isnull(garbageCollector))
+ D.Destroy()
del(D)
return
@@ -162,22 +163,5 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
tag = null
return QDEL_HINT_QUEUE // Garbage Collect everything.
-// If something gets deleted directly, make sure its Destroy proc is still called
-/datum/Del()
- if(isnull(gcDestroyed)) // Not GC'd
- try
- Destroy()
- catch(var/exception/e)
- if(istype(e))
- log_runtime(e, src, "Caught by Del() destroying [type]")
- else
- gcwarning("Del() caught runtime destroying [type]: [e]")
- if(del_profiling)
- delete_profile(src)
- else
- if(del_profiling)
- delete_profile(src)
- return ..()
-
/proc/gcwarning(msg)
log_to_dd("## GC WARNING: [msg]")
diff --git a/code/modules/garbage_collection/gc_testing.dm b/code/modules/garbage_collection/gc_testing.dm
index 686b39a8542..b1b413a0398 100644
--- a/code/modules/garbage_collection/gc_testing.dm
+++ b/code/modules/garbage_collection/gc_testing.dm
@@ -13,28 +13,6 @@
log_admin("[key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].")
message_admins("\blue [key_name_admin(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].", 1)
-/client/proc/gc_toggle_profiling()
- set name = "(GC) Toggle Profiling"
- set desc = "Toggle profiling of deletion methods"
- set category = "Debug"
-
- if(!check_rights(R_DEBUG))
- return
-
- del_profiling = !del_profiling
- log_admin("[key_name(usr)] turned deletion profiling [del_profiling ? "on" : "off"].")
- message_admins("\blue [key_name_admin(usr)] turned deletion profiling [del_profiling ? "on" : "off"].", 1)
-
-/client/proc/gc_show_del_report()
- set name = "(GC) Show Del Report"
- set desc = "Show report of deletions seen while profiling"
- set category = "Debug"
-
- if(!check_rights(R_DEBUG))
- return
-
- delete_profiler_report()
-
/client/proc/gc_dump_hdl()
set name = "(GC) Hard Del List"
set desc = "List types that are hard del()'d by the GC."
@@ -51,77 +29,6 @@
for(var/A in gc_hard_del_types)
to_chat(usr, "[A]")
-// Profiling stuff
-var/global/del_profiling = 0
-var/global/list/dels_profiled = list()
-var/global/list/gdels_profiled = list()
-var/global/list/ghdels_profiled = list()
-
-/proc/delete_profile(var/datum/D)
- if(!ticker || (ticker.current_state < 3)) return
- var/code = 0
- var/type = D.type
- if(isnull(D.gcDestroyed))
- code = 0
- else if(D.hard_deleted == -1)
- code = 0 // A non-queued hard deletion is counted as a straight deletion
- else if(D.hard_deleted)
- code = 1
- else
- code = 2
- switch(code)
- if(0) // Directly deleted (skipped the GC queue entirely)
- if(!("[type]" in dels_profiled))
- dels_profiled["[type]"] = 0
-
- dels_profiled["[type]"] += 1
- if(1) // Hard-deleted by the GC
- if(!("[type]" in ghdels_profiled))
- ghdels_profiled["[type]"] = 0
-
- ghdels_profiled["[type]"] += 1
- if(2) // qdel'd and garbage collected by BYOND
- if(!("[type]" in gdels_profiled))
- gdels_profiled["[type]"] = 0
-
- gdels_profiled["[type]"] += 1
-
-/proc/delete_profiler_report()
- var/dat = "Deletion Profiler Report"
- if(dels_profiled.len + gdels_profiled.len + ghdels_profiled.len)
- dat += "Direct Deletions
"
- dat += "GC Soft Deletions
"
- dat += "GC Hard Deletions
"
- dat += delete_profiler_sortedlist(dels_profiled, "Direct Deletions", "DD")
- dat += delete_profiler_sortedlist(gdels_profiled, "GC Soft Deletions", "SD")
- dat += delete_profiler_sortedlist(ghdels_profiled, "GC Hard Deletions", "HD")
- else
- dat += "(No deletions profiled; listing types that have been hard-deleted by GC)
"
- dat += "| GC Hard Deletion Types |
|---|
"
- for(var/A in gc_hard_del_types)
- dat += "| [A] |
"
- dat += "
"
- usr << browse(dat, "window=delete_profiler_report;size=600x480")
-
-/proc/delete_profiler_sortedlist(var/list/L, var/header, var/anchorid)
- L = L.Copy()
- // Yes, this is a terrible sort, but I'm too lazy to find a good one
- var/v,i,j,s
- for(i = 1 to L.len-1)
- s=i
- v = L[L[i]]
- for(j = i + 1 to L.len)
- if(L[L[j]] > v)
- s = j
- v = L[L[j]]
- L.Swap(i,s)
-
- var/dat = "| [header] |
|---|
"
- for(var/t in L)
- dat +="| [L[t]] | [t] |
"
- dat += "
"
- return dat
-
#ifdef TESTING
/client/var/running_find_references
/datum/var/running_find_references
diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm
index 5ba2b4dcfb3..aaa30c3275f 100644
--- a/code/modules/hydroponics/seed_controller.dm
+++ b/code/modules/hydroponics/seed_controller.dm
@@ -37,11 +37,15 @@ var/global/datum/controller/plants/plant_controller // Set in New().
/datum/controller/plants/New()
if(plant_controller && plant_controller != src)
log_debug("Rebuilding plant controller.")
- del(plant_controller)
+ qdel(plant_controller)
plant_controller = src
setup()
process()
+/datum/controller/plants/Destroy()
+ ..()
+ return QDEL_HINT_HARDDEL_NOW
+
// Predefined/roundstart varieties use a string key to make it
// easier to grab the new variety when mutating. Post-roundstart
// and mutant varieties use their uid converted to a string instead.
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index b7f3eec50bc..8cb7fde6ffc 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -669,9 +669,6 @@ var/list/robot_verbs_default = list(
C.r_arm = new/obj/item/robot_parts/r_arm(C)
C.updateicon()
new/obj/item/robot_parts/chest(loc)
- // This doesn't work. Don't use it.
- //src.Destroy()
- // del() because it's infrequent and mobs act weird in qdel.
qdel(src)
else
// Okay we're not removing the cell or an MMI, but maybe something else?
diff --git a/code/modules/power/supermatter/sm_crystals.dm b/code/modules/power/supermatter/sm_crystals.dm
deleted file mode 100644
index cb9448a2b2e..00000000000
--- a/code/modules/power/supermatter/sm_crystals.dm
+++ /dev/null
@@ -1,179 +0,0 @@
-//separate dm since hydro is getting bloated already
-
-/obj/effect/supermatter_crystal
- name = "supermatter growth"
- anchored = 1
- opacity = 0
- density = 0
- icon = 'icons/obj/lighting.dmi'
- icon_state = "supermatter_crystalf"
- layer = 2.1
- light_color = "#8A8A00"
-
- var/endurance = 100
- var/delay = 1200
- var/floor = 0
- var/spreadChance = 10
- var/spreadIntoAdjacentChance = 10
- var/lastTick = 0
- var/spreaded = 1
- var/deleted = 0
-
-/obj/effect/supermatter_crystal/single
- spreadChance = 0
-
-/obj/effect/supermatter_crystal/New()
- ..()
- light_color = "#8A8A00"
-
- dir = CalcDir()
-
- if(!floor)
- switch(dir) //offset to make it be on the wall rather than on the floor
- if(NORTH)
- pixel_y = 32
- if(SOUTH)
- pixel_y = -32
- if(EAST)
- pixel_x = 32
- if(WEST)
- pixel_x = -32
- icon_state = "supermatter_crystal"
- else
- if( prob( 10 )) // Only 10% of all floor crystals survive, so there's not a forest of 'em
- icon_state = "supermatter_crystalf"
- name = "supermatter crystal"
- density = 1
- else
- deleted = 1
- del( src )
-
- processing_objects += src
-
- set_light(3)
- lastTick = world.timeofday
-
-/obj/effect/supermatter_crystal/Del()
- if( !deleted )
- visible_message("\red \The [src] shatters!")
- new /obj/item/weapon/shard/supermatter( src.loc )
-
- processing_objects -= src
- ..()
-
-/obj/effect/supermatter_crystal/process()
- if(!spreaded)
- return
-
- if(((world.timeofday - lastTick) > delay) || ((world.timeofday - lastTick) < 0))
- lastTick = world.timeofday
- spreaded = 0
-
- for(var/mob/living/l in range( src, 2 ))
- var/rads = 5
- l.apply_effect(rads, IRRADIATE)
-
- for(var/i=1,i<=3,i++)
- if(prob(spreadChance))
- var/list/possibleLocs = list()
- var/spreadsIntoAdjacent = 0
-
- if(prob(spreadIntoAdjacentChance))
- spreadsIntoAdjacent = 1
-
- for(var/turf/simulated/floor/floor in view(3,src))
- if(spreadsIntoAdjacent || !locate(/obj/effect/supermatter_crystal) in view(1,floor))
- possibleLocs += floor
-
- if(!possibleLocs.len)
- break
-
- var/turf/newLoc = pick(possibleLocs)
-
- var/crystalCount = 0 //hacky
- var/placeCount = 1
- for(var/obj/effect/supermatter_crystal/shroom in newLoc)
- crystalCount++
- for(var/wallDir in cardinal)
- var/turf/isWall = get_step(newLoc,wallDir)
- if(isWall.density)
- placeCount++
- if(crystalCount >= placeCount)
- continue
-
- var/obj/effect/supermatter_crystal/child = new /obj/effect/supermatter_crystal(newLoc)
- if( child )
- child.delay = delay
- child.endurance = endurance
-
- spreaded++
-
-/obj/effect/supermatter_crystal/proc/CalcDir(turf/location = loc)
- for(var/wallDir in cardinal)
- var/turf/newTurf = get_step(location,wallDir)
- if(newTurf.density)
- return wallDir
-
-/*
- var/direction = 16
-
- for(var/wallDir in cardinal)
- var/turf/newTurf = get_step(location,wallDir)
- if(newTurf.density)
- direction |= wallDir
-
- for(var/obj/effect/supermatter_crystal/crystal in location)
- if(crystal == src)
- continue
- if(crystal.floor) //special
- direction &= ~16
- else
- direction &= ~crystal.dir
-
- var/list/dirList = list()
-
- for(var/i=1,i<=16,i <<= 1)
- if(direction & i)
- dirList += i
-
- if(dirList.len)
- var/newDir = pick(dirList)
- if(newDir == 16)
- floor = 1
- newDir = 1
- return newDir
-*/
- floor = 1
- return 1
-
-/obj/effect/supermatter_crystal/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
-
- endurance -= W.force
-
- CheckEndurance()
-
-/obj/effect/supermatter_crystal/ex_act(severity)
- switch(severity)
- if(1.0)
- qdel(src)
- return
- if(2.0)
- if(prob(50))
- qdel(src)
- return
- if(3.0)
- if(prob(5))
- qdel(src)
- return
- else
- return
-
-/obj/effect/supermatter_crystal/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > 300)
- endurance -= 5
- CheckEndurance()
-
-/obj/effect/supermatter_crystal/proc/CheckEndurance()
- if(endurance <= 0)
- qdel(src)
\ No newline at end of file
diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm
index 4bdf86deaa9..a7a5162c231 100644
--- a/code/modules/security_levels/security levels.dm
+++ b/code/modules/security_levels/security levels.dm
@@ -85,12 +85,12 @@
move_gamma_ship()
if(security_level < SEC_LEVEL_RED)
- for(var/obj/machinery/door/airlock/highsecurity/red/R in world)
+ for(var/obj/machinery/door/airlock/highsecurity/red/R in airlocks)
if(is_station_level(R.z))
R.locked = 0
R.update_icon()
- for(var/obj/machinery/door/airlock/hatch/gamma/H in world)
+ for(var/obj/machinery/door/airlock/hatch/gamma/H in airlocks)
if(is_station_level(H.z))
H.locked = 0
H.update_icon()
diff --git a/html/changelogs/AutoChangeLog-pr-5296.yml b/html/changelogs/AutoChangeLog-pr-5296.yml
new file mode 100644
index 00000000000..8adce332b7c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5296.yml
@@ -0,0 +1,4 @@
+author: chopchop1614
+delete-after: True
+changes:
+ - bugfix: "Fixed the C4 labcoat exploding bug"
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 9f851fc894c..9e263f8eb5a 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index a6c5a43008f..96e701080fb 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 0be3a5a32d7..70d6ced3311 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl
index 0fcea280c42..ea83dac9217 100644
--- a/nano/templates/chem_master.tmpl
+++ b/nano/templates/chem_master.tmpl
@@ -36,8 +36,8 @@
Containers:
{{if data.condi}}
- {{:helper.link('Create pill (10u max)', 'arrow-right', {'createpill': 1})}}
- {{:helper.link('Create bottle (50u max)', 'arrow-right', {'createpill': 1})}}
+ {{:helper.link('Create pack (10u max)', 'arrow-right', {'createpill': 1})}}
+ {{:helper.link('Create bottle (50u max)', 'arrow-right', {'createbottle': 1})}}
{{else}}
diff --git a/paradise.dme b/paradise.dme
index e5d71626357..67df20fbd6b 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -64,7 +64,6 @@
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\text.dm"
#include "code\__HELPERS\time.dm"
-#include "code\__HELPERS\timed_alerts.dm"
#include "code\__HELPERS\type2type.dm"
#include "code\__HELPERS\unsorted.dm"
#include "code\_DATASTRUCTURES\heap.dm"