diff --git a/code/__SPLURTCODE/DEFINES/hud.dm b/code/__SPLURTCODE/DEFINES/hud.dm
deleted file mode 100644
index 413d7b0100..0000000000
--- a/code/__SPLURTCODE/DEFINES/hud.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-//Borg PDA stuffs
-#define ui_borg_pda_send "CENTER+5:21,SOUTH:5" // To the right of the alert panel
-#define ui_borg_pda_log "CENTER+6:21,SOUTH:5"
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 67b3953084..3a3ffd7ea1 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -69,12 +69,6 @@
syndie = TRUE
if(keyslot.independent)
independent = TRUE
- //Skyrat edit start
- if(extra_channels)
- for(var/ch_name in extra_channels)
- if(!(ch_name in channels))
- channels[ch_name] = extra_channels[ch_name]
- //Skyrat edit end
if(extra_channels)
for(var/ch_name in extra_channels)
diff --git a/modular_splurt/code/_onclick/hud/robot.dm b/modular_splurt/code/_onclick/hud/robot.dm
deleted file mode 100644
index 4d2731e260..0000000000
--- a/modular_splurt/code/_onclick/hud/robot.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/hud/robot/New(mob/owner)
- . = ..()
-
- var/atom/movable/screen/using
-
- //PDA message
- using = new /atom/movable/screen/robot/pda_msg_send
- using.screen_loc = ui_borg_pda_send
- using.hud = src
- static_inventory += using
-
- //PDA log
- using = new /atom/movable/screen/robot/pda_msg_show
- using.screen_loc = ui_borg_pda_log
- using.hud = src
- static_inventory += using
-
-/atom/movable/screen/robot/pda_msg_send
- name = "PDA - Send Message"
- icon = 'icons/mob/screen_ai.dmi'
- icon_state = "pda_send"
-
-/atom/movable/screen/robot/pda_msg_send/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.cmd_send_pdamesg(usr)
-
-/atom/movable/screen/robot/pda_msg_show
- name = "PDA - Show Message Log"
- icon = 'icons/mob/screen_ai.dmi'
- icon_state = "pda_receive"
-
-/atom/movable/screen/robot/pda_msg_show/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.cmd_show_message_log(usr)
-
diff --git a/modular_splurt/code/game/machinery/posialert.dm b/modular_splurt/code/game/machinery/posialert.dm
deleted file mode 100644
index 0c73093991..0000000000
--- a/modular_splurt/code/game/machinery/posialert.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-/obj/machinery/posialert
- var/online = TRUE
- var/obj/item/radio/radio
- var/radio_key = /obj/item/encryptionkey/headset_sci
- var/science_channel = "Science"
-
-/obj/machinery/posialert/Initialize()
- . = ..()
- radio = new(src)
- radio.keyslot = new radio_key
- radio.listening = 0
- radio.recalculateChannels()
-
-/obj/machinery/posialert/Destroy()
- QDEL_NULL(radio)
- return ..()
-
-
-/obj/machinery/posialert/attack_hand(mob/living/user)
- online = !online
- to_chat(user, "You turn the posi-alert system [online ? "on" : "off"]!")
- return
diff --git a/modular_splurt/code/game/object/items/devices/PDA/PDA.dm b/modular_splurt/code/game/object/items/devices/PDA/PDA.dm
deleted file mode 100644
index 3f2e8abbaf..0000000000
--- a/modular_splurt/code/game/object/items/devices/PDA/PDA.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-//TODO: Refractor the whole PDA system to be on /mob/living/silicon and add the pda functions of all the other silicons from /tg/
-/mob/living/silicon/robot/proc/cmd_send_pdamesg(mob/user)
- var/list/plist = list()
- var/list/namecounts = list()
-
- if(aiPDA.toff)
- to_chat(user, "Turn on your receiver in order to send messages.")
- return
-
- for (var/obj/item/pda/P in get_viewable_pdas())
- if (P == src)
- continue
- else if (P == aiPDA)
- continue
-
- plist[avoid_assoc_duplicate_keys(P.owner, namecounts)] = P
-
- var/c = input(user, "Please select a PDA") as null|anything in sortList(plist)
-
- if (!c)
- return
-
- var/selected = plist[c]
-
- if(aicamera.stored.len)
- var/add_photo = input(user,"Do you want to attach a photo?","Photo","No") as null|anything in list("Yes","No")
- if(add_photo=="Yes")
- var/datum/picture/Pic = aicamera.selectpicture(user)
- aiPDA.picture = Pic
-
- if(incapacitated())
- return
-
- aiPDA.create_message(src, selected)
-
-
-/mob/living/silicon/robot/proc/cmd_show_message_log(mob/user)
- if(incapacitated())
- return
- if(!isnull(aiPDA))
- var/HTML = "
AI PDA Message Log[aiPDA.tnote]"
- user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
- else
- to_chat(user, "You do not have a PDA. You should make an issue report about this.")
diff --git a/modular_splurt/code/game/object/items/devices/radio/radio.dm b/modular_splurt/code/game/object/items/devices/radio/radio.dm
deleted file mode 100644
index 67ea054ff5..0000000000
--- a/modular_splurt/code/game/object/items/devices/radio/radio.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/item/radio
- var/list/extra_channels = list() //Allows indivudal channels, used for borgs
diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm
index bfa4b1ab1b..adead03ec0 100644
--- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm
+++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/body_markings.dm
@@ -6,25 +6,6 @@
// use the HumanScissors tool to break your sprite up into the zones easier.
// Although Byond supposedly doesn't have an icon limit anymore of 512 states after 512.1478, just be careful about too many additions.
-//Hyperstation markings
-/datum/sprite_accessory/mam_body_markings/abs
- name = "Abdominals"
- icon_state = "abs"
- covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE)
- icon = 'modular_splurt/icons/mob/mam_markings.dmi'
-
-/datum/sprite_accessory/mam_body_markings/abstwo
- name = "Abdominals Two-Tones"
- icon_state = "absbelly"
- covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED_GREEN)
- icon = 'modular_splurt/icons/mob/mam_markings.dmi'
-
-/datum/sprite_accessory/mam_body_markings/absthree
- name = "Abdominals Three-Tones"
- icon_state = "absarms"
- covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE)
- icon = 'modular_splurt/icons/mob/mam_markings.dmi'
-
/datum/sprite_accessory/mam_body_markings/pigeon
name = "Pigeon"
icon_state = "pigeon"
diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/frills.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/frills.dm
index eabae28bfd..3f833dd55f 100644
--- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/frills.dm
+++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/frills.dm
@@ -11,10 +11,3 @@
icon_state = "cobrahood_alt"
matrixed_sections = MATRIX_RED_GREEN
color_src = MATRIXED
-
-/datum/sprite_accessory/frills/cobraslim
- name = "Narrow Cobra Hood"
- icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
- icon_state = "cobraslim"
- color_src = MATRIXED
- matrixed_sections = MATRIX_RED_GREEN
diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
index 1310a07e99..752213d3fa 100644
--- a/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
+++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot.dm
@@ -1,8 +1,4 @@
//Main code edits
-
-/mob/living/silicon/robot
- var/obj/item/pda/ai/aiPDA //TODO: Refractor the whole PDA system to be on /mob/living/silicon and add the pda functions of all the other silicons from /tg/
-
/// Allows "cyborg" players to change gender at will - Modularised here
/mob/living/silicon/robot/verb/toggle_gender()
set name = "Set Gender"
@@ -32,19 +28,6 @@
has_balls = FALSE
has_vagina = FALSE
-/mob/living/silicon/robot/Initialize(mapload)
- . = ..()
- if(!shell)
- aiPDA = new/obj/item/pda/ai(src)
- aiPDA.owner = real_name
- aiPDA.ownjob = "Cyborg"
- aiPDA.name = real_name + " (" + aiPDA.ownjob + ")"
-
-/mob/living/silicon/robot/replace_identification_name(oldname, newname)
- if(aiPDA && !shell)
- aiPDA.owner = newname
- aiPDA.name = newname + " (" + aiPDA.ownjob + ")"
-
// Slaver medical borg
/mob/living/silicon/robot/modules/syndicate/slaver/medical
faction = list(ROLE_SLAVER)
diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
index 5bd5eb458e..16ddbdc8f5 100644
--- a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -1,42 +1,9 @@
-/obj/item/robot_module
- var/list/added_channels = list() //Borg radio stuffs
-
-/obj/item/robot_module/medical
- added_channels = list(RADIO_CHANNEL_MEDICAL = 1)
-
-/obj/item/robot_module/engineering
- added_channels = list(RADIO_CHANNEL_ENGINEERING = 1)
-
-/obj/item/robot_module/security
- added_channels = list(RADIO_CHANNEL_SECURITY = 1)
-
-/obj/item/robot_module/peacekeeper
- added_channels = list(RADIO_CHANNEL_SECURITY = 1)
-
-/obj/item/robot_module/clown
- added_channels = list(RADIO_CHANNEL_SERVICE = 1)
-
-/obj/item/robot_module/butler
- added_channels = list(RADIO_CHANNEL_SERVICE = 1)
-
-/obj/item/robot_module/miner
- added_channels = list(RADIO_CHANNEL_SUPPLY = 1)
-
/obj/item/robot_module/cargo
added_channels = list(RADIO_CHANNEL_SUPPLY = 1)
-/obj/item/robot_module/syndicate
- added_channels = list(RADIO_CHANNEL_SYNDICATE = 1)
-
/obj/item/robot_module/syndicatejack
added_channels = list(RADIO_CHANNEL_SYNDICATE = 1) // Probably already handled by other code when spawned with pre-set module, but whatever.
-/obj/item/robot_module/syndicate_medical
- added_channels = list(RADIO_CHANNEL_SYNDICATE = 1)
-
-/obj/item/robot_module/saboteur
- added_channels = list(RADIO_CHANNEL_SYNDICATE = 1)
-
/obj/item/robot_module/standard/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
var/static/list/stand_icons
diff --git a/tgstation.dme b/tgstation.dme
index fd5f1e7724..6fc38c114e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -254,7 +254,6 @@
#include "code\__SPLURTCODE\DEFINES\configuration.dm"
#include "code\__SPLURTCODE\DEFINES\cooldowns.dm"
#include "code\__SPLURTCODE\DEFINES\genital_defines.dm"
-#include "code\__SPLURTCODE\DEFINES\hud.dm"
#include "code\__SPLURTCODE\DEFINES\is_helpers.dm"
#include "code\__SPLURTCODE\DEFINES\lewd.dm"
#include "code\__SPLURTCODE\DEFINES\login.dm"
@@ -4248,7 +4247,6 @@
#include "modular_splurt\code\_onclick\observer.dm"
#include "modular_splurt\code\_onclick\hud\new_player.dm"
#include "modular_splurt\code\_onclick\hud\qareenhud.dm"
-#include "modular_splurt\code\_onclick\hud\robot.dm"
#include "modular_splurt\code\_onclick\hud\screen_objects.dm"
#include "modular_splurt\code\_rendering\fullscreen\fullscreen.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_comms.dm"
@@ -4319,7 +4317,6 @@
#include "modular_splurt\code\game\machinery\cryopod.dm"
#include "modular_splurt\code\game\machinery\deployable.dm"
#include "modular_splurt\code\game\machinery\limbgrower.dm"
-#include "modular_splurt\code\game\machinery\posialert.dm"
#include "modular_splurt\code\game\machinery\research_table.dm"
#include "modular_splurt\code\game\machinery\computer\slavery.dm"
#include "modular_splurt\code\game\machinery\doors\brigdoors.dm"
@@ -4350,10 +4347,8 @@
#include "modular_splurt\code\game\object\items\circuitboards\computer_circuitboards.dm"
#include "modular_splurt\code\game\object\items\circuitboards\machine_circuitboards.dm"
#include "modular_splurt\code\game\object\items\circuitboards\miner_circuitboards.dm"
-#include "modular_splurt\code\game\object\items\devices\PDA\PDA.dm"
#include "modular_splurt\code\game\object\items\devices\radio\electropack.dm"
#include "modular_splurt\code\game\object\items\devices\radio\headset.dm"
-#include "modular_splurt\code\game\object\items\devices\radio\radio.dm"
#include "modular_splurt\code\game\object\items\implants\implant_aphropumps.dm"
#include "modular_splurt\code\game\object\items\implants\implant_gfluid.dm"
#include "modular_splurt\code\game\object\items\implants\implant_slave.dm"