diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index dfe42de68bb..629ec4b79dc 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -441,11 +441,12 @@ var/global/datum/controller/subsystem/ticker/ticker //equip_custom_items(player) //VOREStation Removal //player.apply_traits() //VOREStation Removal //VOREStation Addition Start - if(player.client.prefs.auto_backup_implant) - var/obj/item/weapon/implant/backup/imp = new(src) + if(player.client) + if(player.client.prefs.auto_backup_implant) + var/obj/item/weapon/implant/backup/imp = new(src) - if(imp.handle_implant(player,player.zone_sel.selecting)) - imp.post_implant(player) + if(imp.handle_implant(player,player.zone_sel.selecting)) + imp.post_implant(player) //VOREStation Addition End if(captainless) for(var/mob/M in player_list) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 889675681ca..51fb6645535 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -486,12 +486,12 @@ AnnounceArrival(character, rank, join_message, announce_channel, character.z) data_core.manifest_inject(character) ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn + if(ishuman(character)) + if(character.client.prefs.auto_backup_implant) + var/obj/item/weapon/implant/backup/imp = new(src) - if(character.client.prefs.auto_backup_implant) - var/obj/item/weapon/implant/backup/imp = new(src) - - if(imp.handle_implant(character,character.zone_sel.selecting)) - imp.post_implant(character) + if(imp.handle_implant(character,character.zone_sel.selecting)) + imp.post_implant(character) qdel(src) // Delete new_player mob