a terrible creature from another realm. You have a single desire: To kill. \
You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \
Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \
@@ -52,6 +51,7 @@
/mob/living/simple_animal/slaughter/Initialize()
..()
+ ADD_TRAIT(src, TRAIT_BLOODCRAWL_EAT, "innate")
var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
AddSpell(bloodspell)
if(istype(loc, /obj/effect/dummy/phased_mob/slaughter))
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index eb31d9faf27..34d193bc198 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -67,6 +67,7 @@
master.update_icon()
/obj/item/assembly_holder/Crossed(atom/movable/AM as mob|obj)
+ . = ..()
if(a_left)
a_left.Crossed(AM)
if(a_right)
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 8099d18fb93..23de27399b5 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -228,6 +228,7 @@
var/obj/item/assembly/infra/master
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
+ . = ..()
if(istype(AM, /obj/effect/beam))
return
if (isitem(AM))
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 2d205394955..6d33ad62e63 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -613,6 +613,7 @@
QDEL_IN(src, AMMO_DROP_LIFETIME)
/obj/effect/ctf/ammo/Crossed(atom/movable/AM)
+ . = ..()
reload(AM)
/obj/effect/ctf/ammo/Bump(atom/A)
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 1aa70547441..6679125ad6e 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -127,6 +127,7 @@
var/triggered = 0
/obj/effect/meatgrinder/Crossed(atom/movable/AM)
+ . = ..()
Bumped(AM)
/obj/effect/meatgrinder/Bumped(atom/movable/AM)
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index 7bee3017d9f..287fba69aaa 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -95,6 +95,31 @@
export_types = list(/obj/item/radio)
exclude_types = list(/obj/item/radio/mech)
+//Advanced/Power Tools.
+/datum/export/weldingtool/experimental
+ cost = 90
+ unit_name = "experimental welding tool"
+ export_types = list(/obj/item/weldingtool/experimental)
+
+/datum/export/jawsoflife
+ cost = 100
+ unit_name = "jaws of life"
+ export_types = list(/obj/item/crowbar/power)
+
+/datum/export/handdrill
+ cost = 100
+ unit_name = "hand drill"
+ export_types = list(/obj/item/screwdriver/power)
+
+/datum/export/rld_mini
+ cost = 150
+ unit_name = "mini rapid lighting device"
+ export_types = list(/obj/item/construction/rld/mini)
+
+/datum/export/rsf
+ cost = 100
+ unit_name = "rapid service fabricator"
+ export_types = list(/obj/item/rsf)
/datum/export/rcd
cost = 100
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 583c470a9a2..c7a2b723c50 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1467,7 +1467,7 @@
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
- /obj/item/broom,
+ /obj/item/pushbroom,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index f76f0e50675..d1578a216d3 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -166,6 +166,7 @@
//Do not override this proc, instead use the appropiate procs.
//This proc will handle the calls to the appropiate procs.
/datum/round_event/process()
+ SHOULD_NOT_OVERRIDE(TRUE)
if(!processing)
return
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 4231eb71952..f6135348ba7 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -351,6 +351,7 @@
playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/spacevine/Crossed(atom/movable/AM)
+ . = ..()
if(!isliving(AM))
return
for(var/datum/spacevine_mutation/SM in mutations)
diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm
index 4d3a4cf4b70..f8d139a45dd 100644
--- a/code/modules/fields/turf_objects.dm
+++ b/code/modules/fields/turf_objects.dm
@@ -29,6 +29,7 @@
return parent.field_turf_canpass(AM, src, target)
/obj/effect/abstract/proximity_checker/advanced/field_turf/Crossed(atom/movable/AM)
+ . = ..()
if(parent)
return parent.field_turf_crossed(AM, src)
return TRUE
@@ -53,6 +54,7 @@
return parent.field_edge_canpass(AM, src, target)
/obj/effect/abstract/proximity_checker/advanced/field_edge/Crossed(atom/movable/AM)
+ . = ..()
if(parent)
return parent.field_edge_crossed(AM, src)
return TRUE
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index bbfcdc96b1a..ebf752b8088 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -134,6 +134,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
Show()
/obj/effect/hallucination/simple/Moved(atom/OldLoc, Dir)
+ . = ..()
Show()
/obj/effect/hallucination/simple/Destroy()
@@ -1082,6 +1083,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.client.images += image
/obj/effect/hallucination/danger/lava/Crossed(atom/movable/AM)
+ . = ..()
if(AM == target)
target.adjustStaminaLoss(20)
new /datum/hallucination/fire(target)
@@ -1095,6 +1097,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.client.images += image
/obj/effect/hallucination/danger/chasm/Crossed(atom/movable/AM)
+ . = ..()
if(AM == target)
if(istype(target, /obj/effect/dummy/phased_mob))
return
@@ -1124,6 +1127,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.client.images += image
/obj/effect/hallucination/danger/anomaly/Crossed(atom/movable/AM)
+ . = ..()
if(AM == target)
new /datum/hallucination/shock(target)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 5f331e5df74..520115b1f03 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -704,7 +704,7 @@
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
name = "Pwr Game"
- desc = "The only drink with the PWR that true gamers crave."
+ desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to."
icon_state = "purple_can"
list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index a85b7ba05e3..d5e6a33ff2e 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -246,6 +246,7 @@
StartBurning()
/obj/structure/bonfire/Crossed(atom/movable/AM)
+ . = ..()
if(burning & !grill)
Burn()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 4853843213a..691c7cc5a9d 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -76,6 +76,7 @@
resistance_flags = FLAMMABLE
/obj/item/cultivator/rake/Crossed(atom/movable/AM)
+ . = ..()
if(!ishuman(AM))
return
var/mob/living/carbon/human/H = AM
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index ffe88fd4699..71e21669200 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -315,7 +315,7 @@
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_TINY
- var/obj/machinery/computer/libraryconsole/bookmanagement/computer //Associated computer - Modes 1 to 3 use this
+ var/obj/machinery/computer/bookmanagement/computer //Associated computer - Modes 1 to 3 use this
var/obj/item/book/book //Currently scanned book
var/mode = 0 //0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index a589d35b344..c658c906fd8 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -70,7 +70,7 @@
/obj/machinery/computer/libraryconsole/Topic(href, href_list)
. = ..()
- if(..())
+ if(.)
usr << browse(null, "window=publiclibrary")
onclose(usr, "publiclibrary")
return
@@ -162,14 +162,21 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
// TODO: Make this an actual /obj/machinery/computer that can be crafted from circuit boards and such
// It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it.
// It's December 25th, 2014, and this is STILL here, and it's STILL relevant. Kill me
-/obj/machinery/computer/libraryconsole/bookmanagement
+/obj/machinery/computer/bookmanagement
name = "book inventory management console"
desc = "Librarian's command station."
- screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book
verb_say = "beeps"
verb_ask = "beeps"
verb_exclaim = "beeps"
pass_flags = PASSTABLE
+
+ icon_state = "oldcomp"
+ icon_screen = "library"
+ icon_keyboard = null
+ circuit = /obj/item/circuitboard/computer/libraryconsole
+
+ var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book
+
var/arcanecheckout = 0
var/buffer_book
var/buffer_mob
@@ -182,7 +189,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
var/page = 1 //current page of the external archives
var/cooldown = 0
-/obj/machinery/computer/libraryconsole/bookmanagement/proc/build_library_menu()
+/obj/machinery/computer/bookmanagement/proc/build_library_menu()
if(libcomp_menu)
return
load_library_db_to_cache()
@@ -198,13 +205,13 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
libcomp_menu[page] = ""
libcomp_menu[page] += "| [C.author] | [C.title] | [C.category] | \[Order\] |
\n"
-/obj/machinery/computer/libraryconsole/bookmanagement/Initialize()
+/obj/machinery/computer/bookmanagement/Initialize()
. = ..()
if(circuit)
circuit.name = "Book Inventory Management Console (Machine Board)"
- circuit.build_path = /obj/machinery/computer/libraryconsole/bookmanagement
+ circuit.build_path = /obj/machinery/computer/bookmanagement
-/obj/machinery/computer/libraryconsole/bookmanagement/ui_interact(mob/user)
+/obj/machinery/computer/bookmanagement/ui_interact(mob/user)
. = ..()
var/dat = "" //
switch(screenstate)
@@ -316,17 +323,17 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
-/obj/machinery/computer/libraryconsole/bookmanagement/proc/findscanner(viewrange)
+/obj/machinery/computer/bookmanagement/proc/findscanner(viewrange)
for(var/obj/machinery/libraryscanner/S in range(viewrange, get_turf(src)))
return S
return null
-/obj/machinery/computer/libraryconsole/bookmanagement/proc/print_forbidden_lore(mob/user)
+/obj/machinery/computer/bookmanagement/proc/print_forbidden_lore(mob/user)
new /obj/item/melee/cultblade/dagger(get_turf(src))
to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...")
user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2)
-/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/W, mob/user, params)
+/obj/machinery/computer/bookmanagement/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/barcodescanner))
var/obj/item/barcodescanner/scanner = W
scanner.computer = src
@@ -335,11 +342,11 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
else
return ..()
-/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user)
+/obj/machinery/computer/bookmanagement/emag_act(mob/user)
if(density && !(obj_flags & EMAGGED))
obj_flags |= EMAGGED
-/obj/machinery/computer/libraryconsole/bookmanagement/Topic(href, href_list)
+/obj/machinery/computer/bookmanagement/Topic(href, href_list)
if(..())
usr << browse(null, "window=library")
onclose(usr, "library")
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index e7d7fd4898d..cecd61091bf 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -138,6 +138,7 @@
// Do not call except via load() above.
/datum/parsed_map/proc/_load_impl(x_offset = 1, y_offset = 1, z_offset = world.maxz + 1, cropMap = FALSE, no_changeturf = FALSE, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, placeOnTop = FALSE)
+ PRIVATE_PROC(TRUE)
var/list/areaCache = list()
var/list/modelCache = build_cache(no_changeturf)
var/space_key = modelCache[SPACE_KEY]
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 386fb930a44..d1427da54c6 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -13,7 +13,7 @@
var/obj/item/organ/regenerative_core/C = M
if(!istype(C, /obj/item/organ/regenerative_core))
to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.")
- return ..()
+ return
C.preserved()
to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 5b37d8b5265..3d2dfb8fb84 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -49,7 +49,7 @@
if(15)
new /obj/item/nullrod/armblade(src)
if(16)
- new /obj/item/guardiancreator/hive(src)
+ new /obj/item/guardiancreator/miner(src)
if(17)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 61366a12d77..570392f2929 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -8,6 +8,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
throwforce = 0
/mob/dead/Initialize()
+ SHOULD_CALL_PARENT(FALSE)
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 96b80844205..84f2723165c 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -294,6 +294,7 @@
/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE) //Force overrides TRAIT_NODROP for things like wizarditis and admin undress.
//Use no_move if the item is just gonna be immediately moved afterward
//Invdrop is used to prevent stuff in pockets dropping. only set to false if it's going to immediately be replaced
+ PROTECTED_PROC(TRUE)
if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for TRAIT_NODROP.
return TRUE
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index 7df2586ec45..75ee9c53c25 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -60,7 +60,7 @@
forceMove(holder)
// if we're not pulling anyone, or we can't eat anyone
- if(!pullee || bloodcrawl != BLOODCRAWL_EAT)
+ if(!pullee || !HAS_TRAIT(src, TRAIT_BLOODCRAWL_EAT))
notransform = FALSE
return
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index eb9133697c4..53b5afe1df4 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -89,8 +89,8 @@
Attach(M)
/obj/item/clothing/mask/facehugger/Crossed(atom/target)
+ . = ..()
HasProximity(target)
- return
/obj/item/clothing/mask/facehugger/on_found(mob/finder)
if(stat == CONSCIOUS)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7771c380d27..9d093d22ba5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -167,9 +167,15 @@
if(ITEM_SLOT_ICLOTHING in obscured)
dat += "| Uniform: | Obscured |
"
else
- dat += "| Uniform: | [(w_uniform && !(w_uniform.item_flags & ABSTRACT)) ? w_uniform : "Empty"] |
"
+ dat += "| Uniform: | [(w_uniform && !(w_uniform.item_flags & ABSTRACT)) ? w_uniform : "Empty"]"
+ if(w_uniform)
+ var/obj/item/clothing/under/U = w_uniform
+ if (U.can_adjust)
+ dat += " Adjust"
+ dat += " |
"
- if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (ITEM_SLOT_ICLOTHING in obscured))
+ var/obj/item/bodypart/O = get_bodypart(BODY_ZONE_CHEST)
+ if((w_uniform == null && !(dna && dna.species.nojumpsuit) && !(O && O.status == BODYPART_ROBOTIC)) || (ITEM_SLOT_ICLOTHING in obscured))
dat += "| ↳Pockets: |
"
dat += "| ↳ID: |
"
dat += "| ↳Belt: |
"
@@ -254,6 +260,16 @@
// Display a warning if the user mocks up
to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
+ if(href_list["toggle_uniform"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY))
+ var/obj/item/clothing/under/U = get_item_by_slot(ITEM_SLOT_ICLOTHING)
+ to_chat(src, "[usr.name] is trying to adjust your [U].")
+ if(do_mob(usr, src, U.strip_delay/2))
+ to_chat(src, "[usr.name] successfully adjusted your [U].")
+ U.toggle_jumpsuit_adjust()
+ update_inv_w_uniform()
+ update_body()
+
+
///////HUDs///////
if(href_list["hud"])
if(!ishuman(usr))
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index df6a887696e..1f460e0a1ae 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -176,7 +176,6 @@
var/hulk_verb = pick("smash","pummel")
if(check_shields(user, 15, "the [hulk_verb]ing"))
return
- ..()
playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1)
visible_message("[user] [hulk_verb]ed [src]!", \
"[user] [hulk_verb]ed [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index d744bcf1753..7ba92ffced3 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -75,20 +75,23 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/sound/attack_sound = 'sound/weapons/punch1.ogg'
var/sound/miss_sound = 'sound/weapons/punchmiss.ogg'
- //Breathing!
- var/obj/item/organ/lungs/mutantlungs = null
+ //Breathing! Most changes are in mutantlungs, though
var/breathid = "o2"
- var/obj/item/organ/brain/mutant_brain = /obj/item/organ/brain
- var/obj/item/organ/heart/mutant_heart = /obj/item/organ/heart
+
+ //Do NOT remove by setting to null. use OR make a RESPECTIVE TRAIT (removing stomach? add the NOSTOMACH trait to your species)
+ //why does it work this way? because traits also disable the downsides of not having an organ, removing organs but not having the trait will make your species die
+ var/obj/item/organ/brain/mutantbrain = /obj/item/organ/brain
+ var/obj/item/organ/heart/mutantheart = /obj/item/organ/heart
+ var/obj/item/organ/lungs/mutantlungs = /obj/item/organ/lungs
var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
- var/obj/item/mutanthands
var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
- var/obj/item/organ/tail/mutanttail = null
-
- var/obj/item/organ/liver/mutantliver
- var/obj/item/organ/stomach/mutantstomach
+ var/obj/item/organ/liver/mutantliver = /obj/item/organ/liver
+ var/obj/item/organ/stomach/mutantstomach = /obj/item/organ/stomach
+ var/obj/item/organ/appendix/mutantappendix = /obj/item/organ/appendix
+ //only an honorary mutantthing because not an organ and not loaded in the same way, you've been warned to do your research
+ var/obj/item/mutanthands
var/override_float = FALSE
//Bitflag that controls what in game ways can select this species as a spawnable source
@@ -149,110 +152,47 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return 0
return 1
-//Will regenerate missing organs
-/datum/species/proc/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE)
- var/obj/item/organ/brain/brain = C.getorganslot(ORGAN_SLOT_BRAIN)
- var/obj/item/organ/heart/heart = C.getorganslot(ORGAN_SLOT_HEART)
- var/obj/item/organ/lungs/lungs = C.getorganslot(ORGAN_SLOT_LUNGS)
- var/obj/item/organ/appendix/appendix = C.getorganslot(ORGAN_SLOT_APPENDIX)
- var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES)
- var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS)
- var/obj/item/organ/tongue/tongue = C.getorganslot(ORGAN_SLOT_TONGUE)
- var/obj/item/organ/liver/liver = C.getorganslot(ORGAN_SLOT_LIVER)
- var/obj/item/organ/stomach/stomach = C.getorganslot(ORGAN_SLOT_STOMACH)
- var/obj/item/organ/tail/tail = C.getorganslot(ORGAN_SLOT_TAIL)
- var/should_have_brain = TRUE
- var/should_have_heart = !(NOBLOOD in species_traits)
- var/should_have_lungs = !(TRAIT_NOBREATH in inherent_traits)
- var/should_have_appendix = !(TRAIT_NOHUNGER in inherent_traits)
- var/should_have_eyes = TRUE
- var/should_have_ears = TRUE
- var/should_have_tongue = TRUE
- var/should_have_liver = !(TRAIT_NOMETABOLISM in inherent_traits)
- var/should_have_stomach = !(NOSTOMACH in species_traits)
- var/should_have_tail = mutanttail
+/** regenerate_organs
+ * Corrects organs in a carbon, removing ones it doesn't need and adding ones it does
+ *
+ * takes all organ slots, removes organs a species should not have, adds organs a species should have.
+ * can use replace_current to refresh all organs, creating an entirely new set.
+ * Arguments:
+ * C - carbon, the owner of the species datum AKA whoever we're regenerating organs in
+ * old_species - datum, used when regenerate organs is called in a switching species to remove old mutant organs.
+ * replace_current - boolean, forces all old organs to get deleted whether or not they pass the species' ability to keep that organ
+ * excluded_zones - list, add zone defines to block organs inside of the zones from getting handled. see headless mutation for an example
+ */
+/datum/species/proc/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE,list/excluded_zones)
+ //what should be put in if there is no mutantorgan (brains handled seperately)
+ var/list/slot_mutantorgans = list(ORGAN_SLOT_BRAIN = mutantbrain, ORGAN_SLOT_HEART = mutantheart, ORGAN_SLOT_LUNGS = mutantlungs, ORGAN_SLOT_APPENDIX = mutantappendix, \
+ ORGAN_SLOT_EYES = mutanteyes, ORGAN_SLOT_EARS = mutantears, ORGAN_SLOT_TONGUE = mutanttongue, ORGAN_SLOT_LIVER = mutantliver, ORGAN_SLOT_STOMACH = mutantstomach)
- if(heart && (!should_have_heart || replace_current))
- heart.Remove(C,1)
- QDEL_NULL(heart)
- if(should_have_heart && !heart)
- heart = new mutant_heart()
- heart.Insert(C)
+ for(var/slot in list(ORGAN_SLOT_BRAIN, ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_APPENDIX, \
+ ORGAN_SLOT_EYES, ORGAN_SLOT_EARS, ORGAN_SLOT_TONGUE, ORGAN_SLOT_LIVER, ORGAN_SLOT_STOMACH))
- if(lungs && (!should_have_lungs || replace_current))
- lungs.Remove(C,1)
- QDEL_NULL(lungs)
- if(should_have_lungs && !lungs)
- if(mutantlungs)
- lungs = new mutantlungs()
- else
- lungs = new()
- lungs.Insert(C)
+ var/obj/item/organ/oldorgan = C.getorganslot(slot) //used in removing
+ var/obj/item/organ/neworgan = slot_mutantorgans[slot] //used in adding
+ var/used_neworgan = FALSE
+ neworgan = new neworgan()
+ var/should_have = neworgan.get_availability(src) //organ proc that points back to a species trait (so if the species is supposed to have this organ)
- if(liver && (!should_have_liver || replace_current))
- liver.Remove(C,1)
- QDEL_NULL(liver)
- if(should_have_liver && !liver)
- if(mutantliver)
- liver = new mutantliver()
- else
- liver = new()
- liver.Insert(C)
+ if(oldorgan && (!should_have || replace_current) && !(oldorgan.zone in excluded_zones))
+ if(slot == ORGAN_SLOT_BRAIN)
+ var/obj/item/organ/brain/brain = oldorgan
+ if(!brain.decoy_override)//"Just keep it if it's fake" - confucius, probably
+ brain.Remove(C,TRUE, TRUE) //brain argument used so it doesn't cause any... sudden death.
+ QDEL_NULL(brain)
+ oldorgan.Remove(C,TRUE)
+ QDEL_NULL(oldorgan)
- if(stomach && (!should_have_stomach || replace_current))
- stomach.Remove(C,1)
- QDEL_NULL(stomach)
- if(should_have_stomach && !stomach)
- if(mutantstomach)
- stomach = new mutantstomach()
- else
- stomach = new()
- stomach.Insert(C)
+ if(!oldorgan && should_have && !(initial(neworgan.zone) in excluded_zones))
+ used_neworgan = TRUE
+ neworgan.Insert(C)
- if(appendix && (!should_have_appendix || replace_current))
- appendix.Remove(C,1)
- QDEL_NULL(appendix)
- if(should_have_appendix && !appendix)
- appendix = new()
- appendix.Insert(C)
-
- if(tail && (!should_have_tail || replace_current))
- tail.Remove(C,1)
- QDEL_NULL(tail)
- if(should_have_tail && !tail)
- tail = new mutanttail()
- tail.Insert(C)
-
- if(C.get_bodypart(BODY_ZONE_HEAD))
- if(brain && (replace_current || !should_have_brain))
- if(!brain.decoy_override)//Just keep it if it's fake
- brain.Remove(C,TRUE,TRUE)
- QDEL_NULL(brain)
- if(should_have_brain && !brain)
- brain = new mutant_brain()
- brain.Insert(C, TRUE, TRUE)
-
- if(eyes && (replace_current || !should_have_eyes))
- eyes.Remove(C,1)
- QDEL_NULL(eyes)
- if(should_have_eyes && !eyes)
- eyes = new mutanteyes
- eyes.Insert(C)
-
- if(ears && (replace_current || !should_have_ears))
- ears.Remove(C,1)
- QDEL_NULL(ears)
- if(should_have_ears && !ears)
- ears = new mutantears
- ears.Insert(C)
-
- if(tongue && (replace_current || !should_have_tongue))
- tongue.Remove(C,1)
- QDEL_NULL(tongue)
- if(should_have_tongue && !tongue)
- tongue = new mutanttongue
- tongue.Insert(C)
+ if(!used_neworgan)
+ qdel(neworgan)
if(old_species)
for(var/mutantorgan in old_species.mutant_organs)
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index 74d83cdedf7..9935717ba80 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -6,7 +6,7 @@
inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None")
use_skintones = TRUE
- mutant_brain = /obj/item/organ/brain/dullahan
+ mutantbrain = /obj/item/organ/brain/dullahan
mutanteyes = /obj/item/organ/eyes/dullahan
mutanttongue = /obj/item/organ/tongue/dullahan
mutantears = /obj/item/organ/ears/dullahan
@@ -142,8 +142,8 @@
hearers += owner
//Stops dullahans from gibbing when regenerating limbs
-/obj/item/dullahan_relay/proc/unlist_head(datum/source, noheal = FALSE, list/excluded_limbs)
- excluded_limbs |= BODY_ZONE_HEAD
+/obj/item/dullahan_relay/proc/unlist_head(datum/source, noheal = FALSE, list/excluded_zones)
+ excluded_zones |= BODY_ZONE_HEAD
//Retrieving the owner's head for better ahealing.
/obj/item/dullahan_relay/proc/retrieve_head(datum/source, full_heal, admin_revive)
diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
index 20926b5dce9..0b646fab85d 100644
--- a/code/modules/mob/living/carbon/human/species_types/felinid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -9,7 +9,7 @@
default_features = list("mcolor" = "FFF", "tail_human" = "Cat", "ears" = "Cat", "wings" = "None")
mutantears = /obj/item/organ/ears/cat
- mutanttail = /obj/item/organ/tail/cat
+ mutant_organs = list(/obj/item/organ/tail/cat)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
var/original_felinid = TRUE //set to false for felinids created by mass-purrbation
@@ -61,12 +61,12 @@
var/obj/item/organ/tail/cat/tail = new
tail.Insert(H, drop_if_replaced = FALSE)
else
- mutanttail = null
+ mutant_organs = list()
return ..()
/datum/species/human/felinid/on_species_loss(mob/living/carbon/H, datum/species/new_species, pref_load)
var/obj/item/organ/ears/cat/ears = H.getorgan(/obj/item/organ/ears/cat)
- var/obj/item/organ/tail/cat/tail = H.getorgan(/obj/item/organ/tail/cat)
+// var/obj/item/organ/tail/cat/tail = H.getorgan(/obj/item/organ/tail/cat)
if(ears)
var/obj/item/organ/ears/NE
@@ -80,10 +80,12 @@
NE = new /obj/item/organ/ears
NE.Insert(H, drop_if_replaced = FALSE)
+/*
if(tail)
var/obj/item/organ/tail/NT
- if(new_species && new_species.mutanttail)
- // Roundstart cat tail overrides new_species.mutanttail, reset it here.
+ NT = locate(/obj/item/organ/tail) in new_species.mutant_organs
+ if(NT)
+ // Roundstart cat tail overrides new_species tail, reset it here.
new_species.mutanttail = initial(new_species.mutanttail)
if(new_species.mutanttail)
NT = new new_species.mutanttail
@@ -91,6 +93,7 @@
NT.Insert(H, drop_if_replaced = FALSE)
else
tail.Remove(H)
+*/
/proc/mass_purrbation()
for(var/M in GLOB.mob_list)
@@ -141,8 +144,9 @@
for(var/obj/item/organ/current_organ in organs)
if(istype(current_organ, /obj/item/organ/tail/cat))
current_organ.Remove(H, TRUE)
- if(target_species.mutanttail)
- var/obj/item/organ/new_tail = new target_species.mutanttail
+ var/obj/item/organ/tail/new_tail = locate(/obj/item/organ/tail) in target_species.mutant_organs
+ if(new_tail)
+ new_tail = new new_tail()
new_tail.Insert(H, TRUE, FALSE)
if(istype(current_organ, /obj/item/organ/ears/cat))
var/obj/item/organ/new_ears = new target_species.mutantears
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 283fc02fb96..6ec26a5c6ea 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -8,7 +8,7 @@
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
mutanttongue = /obj/item/organ/tongue/lizard
- mutanttail = /obj/item/organ/tail/lizard
+ mutant_organs = list(/obj/item/organ/tail/lizard)
coldmod = 1.5
heatmod = 0.67
default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 8a4412f4950..f8865b97c79 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -18,7 +18,7 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
species_language_holder = /datum/language_holder/moth
-/datum/species/moth/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE)
+/datum/species/moth/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE,list/excluded_zones)
. = ..()
if(ishuman(C))
var/mob/living/carbon/human/H = C
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 17bf82f2202..c134f3d47b2 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -39,8 +39,8 @@
species_traits = list(NOBLOOD,NO_UNDERWEAR,NO_DNA_COPY,NOTRANSSTING,NOEYESPRITES)
inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER)
mutanteyes = /obj/item/organ/eyes/night_vision/nightmare
- mutant_organs = list(/obj/item/organ/heart/nightmare)
- mutant_brain = /obj/item/organ/brain/nightmare
+ mutantheart = /obj/item/organ/heart/nightmare
+ mutantbrain = /obj/item/organ/brain/nightmare
var/info_text = "You are a Nightmare. The ability shadow walk allows unlimited, unrestricted movement in the dark while activated. \
Your light eater will destroy any light producing objects you attack, as well as destroy any lights a living creature may be holding. You will automatically dodge gunfire and melee attacks when on a dark tile. If killed, you will eventually revive if left in darkness."
diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm
index 9296e9ee58b..375ba7be6dc 100644
--- a/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -41,7 +41,7 @@
var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
if(istype(bag, /obj/item/storage/backpack/snail))
bag.emptyStorage()
- C.doUnEquip(bag, TRUE, no_move = TRUE)
+ C.temporarilyRemoveItemFromInventory(bag, TRUE)
qdel(bag)
/obj/item/storage/backpack/snail
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 8e9874d0faa..1bd65fc01ab 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -9,7 +9,7 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN
exotic_bloodtype = "U"
use_skintones = TRUE
- mutant_heart = /obj/item/organ/heart/vampire
+ mutantheart = /obj/item/organ/heart/vampire
mutanttongue = /obj/item/organ/tongue/vampire
limbs_id = "human"
skinned_type = /obj/item/stack/sheet/animalhide/human
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 22ec966267b..14b4427433d 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -59,10 +59,9 @@
var/on_fire = 0 ///The "Are we on fire?" var
var/fire_stacks = 0 ///Tracks how many stacks of fire we have on, max is usually 20
- var/bloodcrawl = 0 ///0 No blood crawling, [BLOODCRAWL] for bloodcrawling, [BLOODCRAWL_EAT] for crawling+mob devour
- var/holder = null ///The holder for blood crawling
- var/ventcrawler = 0 ///0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
- var/limb_destroyer = 0 ///1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
+ var/holder = null //The holder for blood crawling
+ var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
+ var/limb_destroyer = 0 //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
var/mob_size = MOB_SIZE_HUMAN
var/mob_biotypes = MOB_ORGANIC
@@ -128,10 +127,10 @@
var/list/ownedSoullinks //soullinks we are the owner of
var/list/sharedSoullinks //soullinks we are a/the sharer of
-
+
/// List of changes to body temperature, used by desease symtoms like fever
var/list/body_temp_changes = list()
-
+
//this stuff is here to make it simple for admins to mess with custom held sprites
var/icon/held_lh = 'icons/mob/pets_held_lh.dmi'//icons for holding mobs
var/icon/held_rh = 'icons/mob/pets_held_rh.dmi'
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 2e404b29dbe..fd3a3af0b83 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -55,6 +55,9 @@
return
visible_message("[src] deactivates its holochassis emitter and folds back into a compact card!")
stop_pulling()
+ if(istype(loc, /obj/item/clothing/head/mob_holder))
+ var/obj/item/clothing/head/mob_holder/MH = loc
+ MH.release()
if(client)
client.perspective = EYE_PERSPECTIVE
client.eye = card
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2b73aa86036..8af80955afa 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -856,6 +856,16 @@
new_hat.forceMove(src)
update_icons()
+/**
+ *Checking Exited() to detect if a hat gets up and walks off.
+ *Drones and pAIs might do this, after all.
+*/
+/mob/living/silicon/robot/Exited(atom/A)
+ if(hat && hat == A)
+ hat = null
+ update_icons()
+ . = ..()
+
/mob/living/silicon/robot/proc/make_shell(var/obj/item/borg/upgrade/ai/board)
if(!board)
upgrades |= new /obj/item/borg/upgrade/ai(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 6250193bdb5..2eb08be7eea 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -1,7 +1,6 @@
GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't really work on borgos
/obj/item/clothing/head/helmet/space,
/obj/item/clothing/head/welding,
- /obj/item/clothing/head/mob_holder, //I am so very upset that this breaks things
/obj/item/clothing/head/chameleon/broken \
)))
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index fa2cfa0718e..45bdd5d1982 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -50,6 +50,7 @@
to_chat(user, "You pick [src] up.")
drop_all_held_items()
var/obj/item/clothing/head/mob_holder/drone/DH = new(get_turf(src), src)
+ DH.slot_flags = worn_slot_flags
user.put_in_hands(DH)
/mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index dbb8ff45980..0b973774933 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
hud_type = /datum/hud/guardian
dextrous_hud_type = /datum/hud/dextrous/guardian //if we're set to dextrous, account for it.
var/mutable_appearance/cooloverlay
- var/guardiancolor = "#ffffff"
+ var/guardiancolor
var/recolorentiresprite
var/theme
var/list/guardian_overlays[GUARDIAN_TOTAL_LAYERS]
@@ -54,11 +54,11 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/mob/living/summoner
var/range = 10 //how far from the user the spirit can be
var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses
- var/playstyle_string = "You are a standard Guardian. You shouldn't exist!"
+ var/playstyle_string = "You are a Guardian without any type. You shouldn't exist!"
var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!"
var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!"
var/carp_fluff_string = "CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP"
- var/hive_fluff_string = "The mass seems to be an anomaly, it shouldn't exist... Submit a bug report!"
+ var/miner_fluff_string = "You encounter... Mythril, it shouldn't exist... Submit a bug report!"
/mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme)
GLOB.parasites += src
@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme
if(!theme)
- theme = pick("magic", "tech", "carp", "hive")
+ theme = pick("magic", "tech", "carp", "miner")
switch(theme)//should make it easier to create new stand designs in the future if anyone likes that
if("magic")
name = "Guardian Spirit"
@@ -103,6 +103,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
icon_state = "techbase"
icon_living = "techbase"
icon_dead = "techbase"
+ if("miner")
+ name = "Power Miner"
+ real_name = "Power Miner"
+ bubble_icon = "guardian"
+ icon_state = "minerbase"
+ icon_living = "minerbase"
+ icon_dead = "minerbase"
if("carp")
name = "Holocarp"
real_name = "Holocarp"
@@ -116,18 +123,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
recolorentiresprite = TRUE
- if("hive")
- name = "Hivelord"
- real_name = "Hivelord"
- bubble_icon = "guardian"
- icon_state = "hivebase"
- icon_living = "hivebase"
- icon_dead = "hivebase"
- speak_emote = list("telepathically cries")
- desc = "A truly alien creature, it is a mass of unknown organic material, standing by its' owner's side."
- attack_verb_continuous = "lashes out at"
- attack_verb_simple = "lash out at"
- attack_sound = 'sound/weapons/pierce.ogg'
if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason
cooloverlay = mutable_appearance(icon, theme)
add_overlay(cooloverlay)
@@ -143,11 +138,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.p_them()] privately there.")
to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain yourself.")
to_chat(src, playstyle_string)
- guardiancustomize()
-
-/mob/living/simple_animal/hostile/guardian/proc/guardiancustomize()
- guardianrecolor()
- guardianrename()
+ if(!guardiancolor)
+ guardianrename()
+ guardianrecolor()
/mob/living/simple_animal/hostile/guardian/proc/guardianrecolor()
guardiancolor = input(src,"What would you like your color to be?","Choose Your Color","#ffffff") as color|null
@@ -465,7 +458,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
to_chat(src, "Your [G.real_name] has been successfully reset.")
message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(G)])")
G.ghostize(0)
- G.guardiancustomize() //give it a new color, to show it's a new person
+ G.guardianrecolor()
+ G.guardianrename() //give it a new color and name, to show it's a new person
G.key = C.key
G.reset = 1
switch(G.theme)
@@ -475,8 +469,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
to_chat(src, "[G.real_name] has been summoned!")
if("carp")
to_chat(src, "[G.real_name] has been caught!")
- if("hive")
- to_chat(src, "[G.real_name] has been created from the core!")
+ if("miner")
+ to_chat(src, "[G.real_name] has appeared!")
guardians -= G
if(!guardians.len)
verbs -= /mob/living/proc/guardian_reset
@@ -613,9 +607,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
if("carp")
to_chat(user, "[G.carp_fluff_string]")
to_chat(user, "[G.real_name] has been caught!")
- if("hive")
- to_chat(user, "[G.hive_fluff_string]")
- to_chat(user, "[G.real_name] has been created from the core!")
+ if("miner")
+ to_chat(user, "[G.miner_fluff_string]")
+ to_chat(user, "[G.real_name] has appeared!")
user.verbs += /mob/living/proc/guardian_comm
user.verbs += /mob/living/proc/guardian_recall
user.verbs += /mob/living/proc/guardian_reset
@@ -727,23 +721,23 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
use_message = "You put the fishsticks in your mouth..."
used_message = "Someone's already taken a bite out of these fishsticks! Ew."
failure_message = "You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up."
- ling_failure = "Carp'sie is fine with changelings, so you shouldn't be seeing this message."
+ ling_failure = "Carp'sie seems to not have taken you as the chosen one. Maybe it's because of your horrifying origin."
allowmultiple = TRUE
/obj/item/guardiancreator/carp/choose
random = FALSE
-/obj/item/guardiancreator/hive
- name = "mysterious core"
- desc = "All that remains of a hivelord. It has a mysterious aura around it..."
- icon = 'icons/obj/surgery.dmi'
- icon_state = "roro core 2"
- theme = "hive"
- mob_name = "Hivelord"
- use_message = "You place the core near your heart..."
- used_message = "This core seems to have decayed and doesn't work anymore..."
- failure_message = "You couldn't gather any mass with the core, maybe try again later."
- ling_failure = "Even the dark energies seem to not want to be near your horrific body."
+/obj/item/guardiancreator/miner
+ name = "dusty shard"
+ desc = "Seems to be a very old rock, may have originated from a strange meteor."
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ icon_state = "dustyshard"
+ theme = "miner"
+ mob_name = "Power Miner"
+ use_message = "You pierce your skin with the shard..."
+ used_message = "This shard seems to have lost all its' power..."
+ failure_message = "The shard hasn't reacted at all. Maybe try again later..."
+ ling_failure = "The power of the shard seems to not react with your horrifying, mutated body."
-/obj/item/guardiancreator/hive/choose
+/obj/item/guardiancreator/miner/choose
random = FALSE
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
index 44c2ab2e8e1..01f101c6455 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
@@ -10,7 +10,7 @@
magic_fluff_string = "..And draw the Space Ninja, a lethal, invisible assassin."
tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space."
- hive_fluff_string = "The mass seems to be able to attack with stealth causing massive damage."
+ miner_fluff_string = "You encounter... Glass, a sharp, fragile attacker."
toggle_button_type = /obj/screen/guardian/ToggleMode/Assassin
var/toggle = FALSE
var/stealthcooldown = 160
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 12463e0bc6c..93b0c555fbe 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -11,7 +11,7 @@
magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault."
tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..."
- hive_fluff_string = "The mass seems to have primal senses, rapidly assaulting its' enemies."
+ miner_fluff_string = "You encounter... Titanium, a lightweight, agile fighter."
var/charging = 0
var/obj/screen/alert/chargealert
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
index 182f45703c0..d07fb00c619 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
@@ -7,7 +7,7 @@
magic_fluff_string = "..And draw the Drone, a dextrous master of construction and repair."
tech_fluff_string = "Boot sequence complete. Dextrous combat modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! You caught one! It can hold stuff in its fins, sort of."
- hive_fluff_string = "The mass seems to be able to... hold stuff?"
+ miner_fluff_string = "You encounter... Gold, a malleable constructor."
dextrous = TRUE
held_items = list(null, null)
var/obj/item/internal_storage //what we're storing within ourself
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index f1e38dabbb4..3a317b4143d 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -14,7 +14,7 @@
magic_fluff_string = "..And draw the Scientist, master of explosive death."
tech_fluff_string = "Boot sequence complete. Explosive modules active. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy."
- hive_fluff_string = "The mass seems to generate explosive energy, destroying everything in its' path."
+ miner_fluff_string = "You encounter... Gibtonite, an explosive fighter."
var/bomb_cooldown = 0
var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
index 641e9664e94..1b50d1ad95c 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
@@ -12,7 +12,7 @@
magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!"
tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish."
- hive_fluff_string = "The mass seems to generate lots of energy, causing everything except its' owner to burn to ash."
+ miner_fluff_string = "You encounter... Plasma, the bringer of fire."
/mob/living/simple_animal/hostile/guardian/fire/Life()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
index 32ec8e5f55a..b8a8bbb5436 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
@@ -7,7 +7,7 @@
magic_fluff_string = "..And draw the Singularity, an anomalous force of terror."
tech_fluff_string = "Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation?"
- hive_fluff_string = "The mass seems to be extremely heavy, and able to relay the heaviness to others."
+ miner_fluff_string = "You encounter... Bananium, a master of gravity business."
var/list/gravito_targets = list()
var/gravity_power_range = 10 //how close the stand must stay to the target to keep the heavy gravity
diff --git a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
index 62eb1a54300..a70bf4edae2 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
@@ -16,7 +16,7 @@
magic_fluff_string = "..And draw the Tesla, a shocking, lethal source of power."
tech_fluff_string = "Boot sequence complete. Lightning modules active. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's a lightning carp! Everyone else goes zap zap."
- hive_fluff_string = "The mass seems to cause lots of thunder strikes around itself."
+ miner_fluff_string = "You encounter... Iron, a conductive master of lightning."
var/datum/beam/summonerchain
var/list/enemychains = list()
var/successfulshocks = 0
diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
index b90e99de0e2..bb2682c464d 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
@@ -8,7 +8,7 @@
magic_fluff_string = "..And draw the Guardian, a stalwart protector that never leaves the side of its charge."
tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy."
- hive_fluff_string = "The mass seems to be extremely resistant to damage and have a special connection with the owner."
+ miner_fluff_string = "You encounter... Uranium, a very resistant guardian."
toggle_button_type = /obj/screen/guardian/ToggleMode
var/toggle = FALSE
diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
index 996b21e8eb4..17018e55266 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
@@ -22,7 +22,7 @@
magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat."
tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one, it's a ranged carp. This fishy can watch people pee in the ocean."
- hive_fluff_string = "The mass seems to be able to create more mass and also hide at will."
+ miner_fluff_string = "You encounter... Diamond, a powerful projectile thrower."
see_invisible = SEE_INVISIBLE_LIVING
see_in_dark = 8
toggle_button_type = /obj/screen/guardian/ToggleMode
@@ -112,6 +112,7 @@
/obj/effect/snare/Crossed(AM as mob|obj)
+ . = ..()
if(isliving(AM) && spawner && spawner.summoner && AM != spawner && !spawner.hasmatchingsummoner(AM))
to_chat(spawner.summoner, "[AM] has crossed surveillance snare, [name].")
var/list/guardians = spawner.summoner.hasparasites()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/standard.dm b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
index 357c593695b..43b741b2fa4 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
@@ -9,7 +9,7 @@
magic_fluff_string = "