mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
This tail refactor turned into an organ refactor. Funny how that works. (#67017)
* Fuck you (refactors ur tails) * Errors * Wow. Pain. * Fixes up probably everything * finish up here * Fixes hard del maybe * original owner hard del * garbage collection runtime * suck my peen byond * Mapped tails * motherfucker. * motherrfucker. again. * Whooopppppsie * yeah bad idea * Turns out external organs literally just sat in nullspace forever if their parent was deleted, and didnt Remove() themselves, causing harddels. * So anyways I repathed all organs * Fixes * really. * unit test... test * unit test-test but it passes linters this time because im a moh-ron * I've lost track of what im doing at this point * Hopefully fixes hard del? * meh * Update code/datums/dna.dm * things n stuff * repath from master pull
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
if(2)
|
||||
new /obj/item/soulstone/anybody/mining(src)
|
||||
if(3)
|
||||
new /obj/item/organ/cyberimp/arm/katana(src)
|
||||
new /obj/item/organ/internal/cyberimp/arm/katana(src)
|
||||
if(4)
|
||||
new /obj/item/clothing/glasses/godeye(src)
|
||||
if(5)
|
||||
@@ -50,7 +50,7 @@
|
||||
if(8)
|
||||
new /obj/item/rod_of_asclepius(src)
|
||||
if(9)
|
||||
new /obj/item/organ/heart/cursed/wizard(src)
|
||||
new /obj/item/organ/internal/heart/cursed/wizard(src)
|
||||
if(10)
|
||||
new /obj/item/ship_in_a_bottle(src)
|
||||
if(11)
|
||||
@@ -139,7 +139,7 @@
|
||||
var/list/choices = subtypesof(/obj/machinery/anomalous_crystal)
|
||||
var/random_crystal = pick(choices)
|
||||
new random_crystal(src)
|
||||
new /obj/item/organ/vocal_cords/colossus(src)
|
||||
new /obj/item/organ/internal/vocal_cords/colossus(src)
|
||||
|
||||
/obj/structure/closet/crate/necropolis/colossus/crusher
|
||||
name = "angelic colossus chest"
|
||||
|
||||
@@ -811,7 +811,7 @@
|
||||
name = "Scan Target"
|
||||
desc = "Contact may or may not be close."
|
||||
|
||||
/obj/item/organ/cyberimp/arm/katana
|
||||
/obj/item/organ/internal/cyberimp/arm/katana
|
||||
name = "dark shard"
|
||||
desc = "An eerie metal shard surrounded by dark energies."
|
||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||
@@ -822,7 +822,7 @@
|
||||
extend_sound = 'sound/items/unsheath.ogg'
|
||||
retract_sound = 'sound/items/sheath.ogg'
|
||||
|
||||
/obj/item/organ/cyberimp/arm/katana/attack_self(mob/user, modifiers)
|
||||
/obj/item/organ/internal/cyberimp/arm/katana/attack_self(mob/user, modifiers)
|
||||
. = ..()
|
||||
to_chat(user, span_userdanger("The mass goes up your arm and goes inside it!"))
|
||||
playsound(user, 'sound/magic/demon_consume.ogg', 50, TRUE)
|
||||
@@ -832,10 +832,10 @@
|
||||
user.temporarilyRemoveItemFromInventory(src, TRUE)
|
||||
Insert(user)
|
||||
|
||||
/obj/item/organ/cyberimp/arm/katana/screwdriver_act(mob/living/user, obj/item/screwtool)
|
||||
/obj/item/organ/internal/cyberimp/arm/katana/screwdriver_act(mob/living/user, obj/item/screwtool)
|
||||
return
|
||||
|
||||
/obj/item/organ/cyberimp/arm/katana/Retract()
|
||||
/obj/item/organ/internal/cyberimp/arm/katana/Retract()
|
||||
var/obj/item/cursed_katana/katana = active_item
|
||||
if(!katana || katana.shattered)
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user