mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +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:
@@ -375,7 +375,7 @@
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(user.getorgan(/obj/item/organ/alien/plasmavessel))
|
||||
if(user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
|
||||
switch(status)
|
||||
if(BURSTING)
|
||||
to_chat(user, span_notice("The child is hatching out."))
|
||||
@@ -443,7 +443,7 @@
|
||||
return
|
||||
|
||||
var/mob/living/carbon/C = AM
|
||||
if(C.stat == CONSCIOUS && C.getorgan(/obj/item/organ/body_egg/alien_embryo))
|
||||
if(C.stat == CONSCIOUS && C.getorgan(/obj/item/organ/internal/body_egg/alien_embryo))
|
||||
return
|
||||
|
||||
Burst(kill=FALSE)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
for(var/buck in buckled_mobs) //breaking a nest releases all the buckled mobs, because the nest isn't holding them down anymore
|
||||
var/mob/living/M = buck
|
||||
|
||||
if(user.getorgan(/obj/item/organ/alien/plasmavessel))
|
||||
if(user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
|
||||
unbuckle_mob(M)
|
||||
add_fingerprint(user)
|
||||
return
|
||||
@@ -51,9 +51,9 @@
|
||||
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated() || M.buckled )
|
||||
return
|
||||
|
||||
if(M.getorgan(/obj/item/organ/alien/plasmavessel))
|
||||
if(M.getorgan(/obj/item/organ/internal/alien/plasmavessel))
|
||||
return
|
||||
if(!user.getorgan(/obj/item/organ/alien/plasmavessel))
|
||||
if(!user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
|
||||
return
|
||||
|
||||
if(has_buckled_mobs())
|
||||
|
||||
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
|
||||
if(3)
|
||||
new /obj/item/reagent_containers/glass/bottle/potion/flight(loc)
|
||||
if(4)
|
||||
new /obj/item/organ/heart/cursed/wizard(loc)
|
||||
new /obj/item/organ/internal/heart/cursed/wizard(loc)
|
||||
if(5)
|
||||
new /obj/item/jacobs_ladder(loc)
|
||||
if(6)
|
||||
|
||||
Reference in New Issue
Block a user