mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Frankenstein Station 13: Introducing dissections and alien organs to xenobiology (#29093)
* ddsadsa ddsadsa * moderate again * revert * beginning with rebase * organssssssssss * organs now process! * analyzer finished! + mapping * tool bit implementation and quality * organs and fixes and reworks * more organ work * more organs done * more organ progress! * more organ work * MORE. ORGANS. * temp * more organsssss * ITS DONE!!!!!!!! * oops * also oops * linter stuff * forgot this + oops * linter * i forgot to save! * lots of improvements and tweaks * move icon over * icon tweaks * icon mistake * oops * dumb * more icon validations * i think thisll fix it? * Apply suggestions from code review Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * fixes * fixes+tweaks * fix * oops * linter * i didnt save.... * this should give -some- warning * forgot a span * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * beginning edits * more fixed and tweaks with cooldowns * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * lots of tweaks * more review changes * comment change * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * returns start back to gland * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * code review fixes * trying to make surgery work.... * might as well push this * perfection. now i need text * text + small tweaks and bugfixing * linting * forgot to implement this * deconflicting maps * modifying for xenos again * i guess this wasnt needed??? * added surgical belts to xeno * minor swap * quick fix * small tweaks * small tweak * tiny tweak * some slime updates * more tweaks * more updates * first batch of fixes * hiero audio fix * robotic fauna fixes * more rounds of bugfixes * prevents teleporting * tiny fix * makes sharp more common * misc fixes * surgery and revenant fixes + extractor * adds cursed organ logging * small bananium organ tweak * actually gives teleporter access * adds a message to the analyzer * can now drag naughts * slime behavior tweaks * headslug tweak, cant eat organs * Update code/datums/components/special_tastes.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/components/special_tastes.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/components/special_tastes.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/slime/slime_mob.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/slime/slime_mob.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/miniantags/revenant/revenant.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/components/special_tastes.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/miniantags/abduction/gland.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/miniantags/abduction/gland.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * moved this * major rework prep * didnt save * rework done * small fix * makes aliens draggable by crew after death * shouldnt have cut this * xeno organ tweak + tips * oops * fixes and tweaks to slimes * not used * temp revert * rebase map files to master * re-applying changes * access fix * access tweak * big fix for new refactor * more refactoring * forgot a span * Update code/datums/components/surgery_initiator.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * hiero only doesnt target dead megafauna * various fixes * fix requests * fixed weird conflict markers * deconflict * deconflicting * antimagic flags * merge fixing * Update code/modules/mining/lavaland/loot/hierophant_loot.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> * regen mesh fix * small fixes * tick fix * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * grammar * Update code/modules/surgery/organs/organ_internal.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/surgery/organs/organ_internal.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/research/xenobiology/xenobiology_organs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/research/xenobiology/xenobiology_organs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/research/xenobiology/xenobiology_organs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * tweaks --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Kyani
@@ -257,7 +257,7 @@
|
||||
|
||||
//to add a splatter of blood or other mob liquid.
|
||||
/mob/living/proc/add_splatter_floor(turf/T, small_drip, shift_x, shift_y)
|
||||
if((get_blood_id() != "blood") && (get_blood_id() != "slimejelly"))//is it blood or welding fuel?
|
||||
if((get_blood_id() != "blood") && (get_blood_id() != "slimejelly") && (get_blood_id() != "tomatojuice"))//is it blood or welding fuel?
|
||||
return
|
||||
if(!T)
|
||||
T = get_turf(src)
|
||||
|
||||
@@ -65,6 +65,8 @@
|
||||
M.dna.SetSEState(GLOB.colourblindblock, FALSE)
|
||||
singlemutcheck(M, GLOB.colourblindblock, MUTCHK_FORCED)
|
||||
. = ..()
|
||||
if(!M)
|
||||
return
|
||||
M.update_tint()
|
||||
M.update_sight()
|
||||
|
||||
|
||||
@@ -9,6 +9,18 @@
|
||||
var/unremovable = FALSE //Whether it shows up as an option to remove during surgery.
|
||||
/// An associated list of organ datums that this organ has.
|
||||
var/list/datum/organ/organ_datums
|
||||
/// This contains the hidden RnD levels of an organ to prevent rnd from using it.
|
||||
var/hidden_origin_tech
|
||||
/// What is the level of tech for the hidden tech type?
|
||||
var/hidden_tech_level = 1
|
||||
/// How much is this organ worth in the xenobiology organ analyzer?
|
||||
var/analyzer_price = 10
|
||||
/// what quality is this organ? Only useful for xeno organs
|
||||
var/organ_quality = ORGAN_NORMAL
|
||||
/// Does this organ originate from the xenobiology dissection loop?
|
||||
var/is_xeno_organ = FALSE
|
||||
/// Does this organ give a warning upon being inserted?
|
||||
var/warning = FALSE
|
||||
|
||||
/obj/item/organ/internal/New(mob/living/carbon/holder)
|
||||
..()
|
||||
@@ -34,6 +46,11 @@
|
||||
QDEL_LIST_ASSOC_VAL(organ_datums) // The removal from internal_organ_datums should be handled when the organ is removed
|
||||
. = ..()
|
||||
|
||||
/obj/item/organ/internal/examine(mob/user)
|
||||
. = ..()
|
||||
if(is_xeno_organ)
|
||||
. += "<span class='info'>It looks like it would replace \the [slot]."
|
||||
|
||||
/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
|
||||
if(!iscarbon(M) || owner == M)
|
||||
return
|
||||
@@ -207,6 +224,9 @@
|
||||
/obj/item/organ/internal/attack__legacy__attackchain(mob/living/carbon/M, mob/user)
|
||||
if(M == user && ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(is_xeno_organ)
|
||||
to_chat(user, "<span class='warning'>It wouldnt be a very good idea to eat this.</span>")
|
||||
return ..()
|
||||
var/obj/item/food/S = prepare_eat()
|
||||
if(S)
|
||||
H.drop_item()
|
||||
@@ -394,3 +414,9 @@
|
||||
SIGNAL_HANDLER
|
||||
REMOVE_TRAIT(src, TRAIT_ORGAN_INSERTED_WHILE_DEAD, "[UID()]")
|
||||
UnregisterSignal(owner, COMSIG_LIVING_DEFIBBED)
|
||||
|
||||
/// Checks that the organ is inside of a host and that they are a valid recipient. Used for abductor glands
|
||||
/obj/item/organ/internal/proc/owner_check()
|
||||
if(ishuman(owner) || iscarbon(owner))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
/obj/item/organ/internal/alien
|
||||
origin_tech = "biotech=5"
|
||||
origin_tech = null
|
||||
icon_state = null
|
||||
var/list/alien_powers = list()
|
||||
var/list/human_powers = list()
|
||||
icon = 'icons/obj/xeno_organs.dmi'
|
||||
tough = TRUE
|
||||
sterile = TRUE
|
||||
/// Amount of credits that will be received by selling this in the cargo shuttle
|
||||
var/cargo_profit = 250
|
||||
/// Has this organ been hijacked? Can hijack via a hemostat
|
||||
var/hijacked = FALSE
|
||||
is_xeno_organ = TRUE
|
||||
|
||||
/// This adds and removes alien spells upon addition, if a noncarbon tries to do this well... I blame adminbus
|
||||
/obj/item/organ/internal/alien/insert(mob/living/carbon/M, special = 0)
|
||||
@@ -27,6 +29,10 @@
|
||||
else
|
||||
for(var/powers_to_remove in human_powers)
|
||||
M.RemoveSpell(new powers_to_remove)
|
||||
if(isalien(M))
|
||||
destroy_on_removal = TRUE
|
||||
else
|
||||
destroy_on_removal = FALSE
|
||||
. = ..()
|
||||
|
||||
/obj/item/organ/internal/alien/examine(mob/user)
|
||||
@@ -62,6 +68,8 @@
|
||||
slot = "plasmavessel"
|
||||
alien_powers = list(/datum/spell/alien_spell/plant_weeds, /datum/spell/alien_spell/transfer_plasma)
|
||||
human_powers = list(/datum/spell/alien_spell/syphon_plasma)
|
||||
hidden_origin_tech = TECH_PLASMA
|
||||
hidden_tech_level = 7
|
||||
|
||||
var/stored_plasma = 100
|
||||
var/max_plasma = 300
|
||||
@@ -132,6 +140,8 @@
|
||||
origin_tech = "biotech=5;materials=2;combat=2"
|
||||
alien_powers = list(/datum/spell/touch/alien_spell/corrosive_acid)
|
||||
human_powers = list(/datum/spell/touch/alien_spell/burning_touch)
|
||||
hidden_origin_tech = TECH_ENGINEERING
|
||||
hidden_tech_level = 6
|
||||
|
||||
/obj/item/organ/internal/alien/hivenode
|
||||
name = "xeno hive node"
|
||||
@@ -140,20 +150,24 @@
|
||||
origin_tech = "biotech=5;magnets=4;bluespace=3"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
alien_powers = list(/datum/spell/alien_spell/whisper)
|
||||
hidden_origin_tech = TECH_BLUESPACE
|
||||
hidden_tech_level = 6
|
||||
|
||||
/obj/item/organ/internal/alien/hivenode/insert(mob/living/carbon/M, special = 0)
|
||||
..()
|
||||
M.faction |= "alien"
|
||||
M.add_language("Hivemind")
|
||||
M.add_language("Xenomorph")
|
||||
ADD_TRAIT(M, TRAIT_XENO_IMMUNE, "xeno immune")
|
||||
if(organ_quality == ORGAN_PRISTINE)
|
||||
M.add_language("Hivemind")
|
||||
M.add_language("Xenomorph")
|
||||
|
||||
/obj/item/organ/internal/alien/hivenode/remove(mob/living/carbon/M, special = 0)
|
||||
M.faction -= "alien"
|
||||
M.remove_language("Hivemind")
|
||||
M.remove_language("Xenomorph")
|
||||
REMOVE_TRAIT(M, TRAIT_XENO_IMMUNE, "xeno immune")
|
||||
. = ..()
|
||||
if(organ_quality == ORGAN_PRISTINE)
|
||||
M.remove_language("Hivemind")
|
||||
M.remove_language("Xenomorph")
|
||||
|
||||
/obj/item/organ/internal/alien/neurotoxin
|
||||
name = "xeno neurotoxin gland"
|
||||
@@ -162,6 +176,8 @@
|
||||
origin_tech = "biotech=5;combat=5"
|
||||
alien_powers = list(/datum/spell/alien_spell/neurotoxin)
|
||||
human_powers = list(/datum/spell/alien_spell/neurotoxin/death_to_xenos)
|
||||
hidden_origin_tech = TECH_BIO
|
||||
hidden_tech_level = 6
|
||||
|
||||
/obj/item/organ/internal/alien/resinspinner
|
||||
name = "xeno resin organ"
|
||||
@@ -170,6 +186,8 @@
|
||||
origin_tech = "biotech=5;materials=4"
|
||||
alien_powers = list(/datum/spell/alien_spell/build_resin)
|
||||
human_powers = list(/datum/spell/touch/alien_spell/consume_resin)
|
||||
hidden_origin_tech = TECH_MATERIAL
|
||||
hidden_tech_level = 7
|
||||
|
||||
/obj/item/organ/internal/alien/eggsac
|
||||
name = "xeno egg sac"
|
||||
@@ -180,3 +198,5 @@
|
||||
alien_powers = list(/datum/spell/alien_spell/plant_weeds/eggs)
|
||||
human_powers = list(/datum/spell/alien_spell/combust_facehuggers)
|
||||
cargo_profit = 1000
|
||||
hidden_origin_tech = TECH_BIO
|
||||
hidden_tech_level = 7
|
||||
|
||||
Reference in New Issue
Block a user