From 7bab1f8a5088e59a03888eb0657c164f6eed8aae Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun, 1 May 2022 17:41:24 -0400 Subject: [PATCH] Revert "making sleevecards children of PAI Cards." This reverts commit 0791ad93337f4b72ce80be6fba28acc0205dad44. --- code/datums/autolathe/devices_vr.dm | 2 +- code/modules/resleeving/machines.dm | 6 +-- code/modules/resleeving/sleevecard_new.dm | 58 ----------------------- vorestation.dme | 6 ++- 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 code/modules/resleeving/sleevecard_new.dm diff --git a/code/datums/autolathe/devices_vr.dm b/code/datums/autolathe/devices_vr.dm index 65af7b630cc..9d92132caa4 100644 --- a/code/datums/autolathe/devices_vr.dm +++ b/code/datums/autolathe/devices_vr.dm @@ -1,3 +1,3 @@ /datum/category_item/autolathe/devices/sleevecard name = "sleevecard" - path =/obj/item/device/paicard/sleevecard + path =/obj/item/device/sleevecard diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 10930eac1b7..bb17833e351 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -509,8 +509,8 @@ qdel(G) src.updateUsrDialog() return //Don't call up else we'll get attack messsages - if(istype(W, /obj/item/device/paicard/sleevecard)) - var/obj/item/device/paicard/sleevecard/C = W + if(istype(W, /obj/item/device/sleevecard)) + var/obj/item/device/sleevecard/C = W user.unEquip(C) C.removePersonality() qdel(C) @@ -556,7 +556,7 @@ return 0 if(mode == 2 && sleevecards) //Card sleeving - var/obj/item/device/paicard/sleevecard/card = new /obj/item/device/paicard/sleevecard(get_turf(src)) + var/obj/item/device/sleevecard/card = new /obj/item/device/sleevecard(get_turf(src)) card.sleeveInto(MR, db_key = db_key) sleevecards-- return 1 diff --git a/code/modules/resleeving/sleevecard_new.dm b/code/modules/resleeving/sleevecard_new.dm deleted file mode 100644 index 04b1b773c22..00000000000 --- a/code/modules/resleeving/sleevecard_new.dm +++ /dev/null @@ -1,58 +0,0 @@ -mob/living/silicon/pai/infomorph - name = "sleevecard" //Has the same name as the card for consistency, but this is the MOB in the card. - //icon = 'icons/mob/pai_vr.dmi' //Changed to the virgo icon, giving more sprite options. - //icon_state = "pai-repairbot" - - emote_type = 2 // pAIs emotes are heard, not seen, so they can be seen through a container (eg. person) - pass_flags = 1 - mob_size = MOB_SMALL - - can_pull_size = ITEMSIZE_SMALL - can_pull_mobs = MOB_PULL_SMALLER - - idcard_type = /obj/item/weapon/card/id - -/mob/living/silicon/pai/infomorph/New(var/obj/item/device/paicard/sleevecard/paicard) - . = ..() - -/obj/item/device/paicard/sleevecard - name = "sleevecard" - desc = "This KHI-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." - catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, - /datum/category_item/catalogue/technology/resleeving) - - icon = 'icons/obj/pda.dmi' - icon_state = "pai" - item_state = "electronic" - - w_class = ITEMSIZE_SMALL - slot_flags = SLOT_BELT - origin_tech = list(TECH_DATA = 2) - show_messages = 0 - /* - var/obj/item/device/radio/sleevecard/radio - var/mob/living/silicon/infomorph/infomorph - var/current_emotion = 1 - */ - matter = list(MAT_STEEL = 4000, MAT_GLASS = 4000) - -/obj/item/device/paicard/sleevecard/proc/sleeveInto(var/datum/transhuman/mind_record/MR, var/db_key) - pai = new(src,MR.mindname,db_key=db_key) - - for(var/datum/language/L in MR.languages) - pai.add_language(L.name) - MR.mind_ref.active = 1 //Well, it's about to be. - MR.mind_ref.transfer_to(pai) //Does mind+ckey+client. - pai.ooc_notes = MR.mind_oocnotes - pai.apply_vore_prefs() //Cheap hack for now to give them SOME bellies. - - //Don't set 'real_name' because then we get a nice (as sleevecard) thing. - pai.name = "[initial(pai.name)] ([MR.mindname])" - name = "[initial(name)] ([MR.mindname])" - var/emoname = pai_emotions[1] - setEmotion(pai_emotions[emoname]) - - if(pai.client) - return 1 - - return 0 \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index fd6c4310042..f6e5be44844 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3746,10 +3746,12 @@ #include "code\modules\resleeving\documents.dm" #include "code\modules\resleeving\implant.dm" #include "code\modules\resleeving\infocore_records.dm" +#include "code\modules\resleeving\infomorph.dm" +#include "code\modules\resleeving\infomorph_software.dm" #include "code\modules\resleeving\machine_subtypes.dm" #include "code\modules\resleeving\machines.dm" #include "code\modules\resleeving\resleeving_sickness.dm" -#include "code\modules\resleeving\sleevecard_new.dm" +#include "code\modules\resleeving\sleevecard.dm" #include "code\modules\rogueminer_vr\asteroid.dm" #include "code\modules\rogueminer_vr\controller.dm" #include "code\modules\rogueminer_vr\debug.dm" @@ -4122,6 +4124,7 @@ #include "maps\expedition_vr\beach\submaps\mountains.dm" #include "maps\expedition_vr\beach\submaps\mountains_areas.dm" #include "maps\gateway_archive_vr\blackmarketpackers.dm" +#include "maps\groundbase\groundbase.dm" #include "maps\offmap_vr\om_ships\abductor.dm" #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" @@ -4138,7 +4141,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\virgo_minitest\virgo_minitest.dm" #include "maps\~map_system\maps.dm" #include "maps\~map_system\maps_vr.dm" // END_INCLUDE