mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-22 05:17:38 +01:00
Shell May Cry: A comprehensive rework of synthetics. (#20721)
https://www.youtube.com/watch?v=9mPvZ96pHJI A pull request commissioned by the Synthetic Lore Team to comprehensively rework synthetics (read: IPCs) and how they work in Aurora. The objective is to make IPCs as unique as possible from humans, upgrading the robotic feel and atmosphere, while also preserving a good sense of balance in-game. Key features: - A comprehensive expansion of synthetic organs, all of which now fulfill a purpose: hydraulics, cooling units, power systems, actuators, diagnostics units. - Customizable organs with benefits and drawbacks, such as with cooling units and power systems. - Unique ways to repair the organs and more involved steps. - Unique damage mechanics - every organ has wiring and electronics which affect its functioning, and they are defended by plating which provides natural armour. - Improved and immersive diagnostics. - Unique features, benefits, and drawbacks for every IPC frame. - A rework of the positronic brain, which can be either destroyed or shut down, alongside effects caused by low integrity. - A rework of how EMPs affect IPC organs. - Non-binary damage states for each organ. To-do: - [x] Finish the unique features for each frame. - [x] Look into if mechanical synthskin is possible. - [x] Power system. - [x] Posibrain mechanics. - [ ] Passive cooling expansion. - [x] EMP mechanics. - [x] Repair mechanics. - [x] Mob weight mechanics. - [ ] Gurney for heavy mobs. - [x] New augments. - [ ] IPC tag scanning and flashing. --------- Signed-off-by: Werner <1331699+Arrow768@users.noreply.github.com> Co-authored-by: Matt Atlas <liermattia@gmail.com> Co-authored-by: Geeves <22774890+Geevies@users.noreply.github.com> Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
@@ -420,7 +420,7 @@
|
||||
make_announcement("pings, \"Resuscitation successful.\"", "notice")
|
||||
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
|
||||
H.resuscitate()
|
||||
var/obj/item/organ/internal/cell/potato = H.internal_organs_by_name[BP_CELL]
|
||||
var/obj/item/organ/internal/machine/power_core/potato = H.internal_organs_by_name[BP_CELL]
|
||||
if(istype(potato) && potato.cell)
|
||||
var/obj/item/cell/C = potato.cell
|
||||
C.give(chargecost)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
var/on = 0 //is it turned on?
|
||||
var/cover_open = 0 //is the cover open?
|
||||
var/obj/item/cell/cell
|
||||
var/max_cooling = 12 //in degrees per second - probably don't need to mess with heat capacity here
|
||||
var/max_cooling = 24 //in degrees per second - probably don't need to mess with heat capacity here
|
||||
var/charge_consumption = 8.3 //charge per second at max_cooling
|
||||
var/thermostat = T20C
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
var/charge_usage = (temp_adj/max_cooling)*charge_consumption
|
||||
|
||||
H.bodytemperature -= temp_adj*efficiency
|
||||
H.bodytemperature = max(T0C, H.bodytemperature - temp_adj*efficiency)
|
||||
|
||||
cell.use(charge_usage)
|
||||
|
||||
|
||||
@@ -83,6 +83,25 @@
|
||||
var/obj/item/organ/external/S = H.get_organ(target_zone)
|
||||
|
||||
if (S && (S.status & ORGAN_ASSISTED))
|
||||
var/datum/component/synthetic_endoskeleton/endoskeleton = H.GetComponent(/datum/component/synthetic_endoskeleton)
|
||||
if(istype(endoskeleton) && endoskeleton.damage)
|
||||
if(target_mob == user)
|
||||
if(endoskeleton.damage >= endoskeleton.max_damage * 0.5)
|
||||
to_chat(user, SPAN_WARNING("Your control over your limbs is too damaged to apply the nanopaste precisely!"))
|
||||
return
|
||||
application_time *= application_multiplier // It takes longer to apply nanopaste to yourself than to someone else.
|
||||
|
||||
if (application_in_progress == FALSE)
|
||||
application_in_progress = TRUE
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins to apply nanite past to the broken support systems of [user != target_mob ? " \the [target_mob]'s" : "\the [user]'s"] endoskeleton..."), \
|
||||
SPAN_NOTICE("You begin to apply nanite paste to the broken support systems of [user != target_mob ? " \the [target_mob]'s" : "your"] [endoskeleton]..."))
|
||||
if(do_mob(user, target_mob, application_time))
|
||||
SEND_SIGNAL(target_mob, COMSIG_SYNTH_ENDOSKELETON_REPAIR, rand(15, 30))
|
||||
user.visible_message(SPAN_NOTICE("\The [user] mends the broken links in [user != target_mob ? " \the [target_mob]'s" : "\the [user]'s"] endoskeleton with \the [src]."),\
|
||||
SPAN_NOTICE("You successfully mend the broken links in[user == target_mob ? "your" : "[target_mob]'s"] endoskeleton with \the [src]."))
|
||||
use(1)
|
||||
application_in_progress = FALSE
|
||||
|
||||
if(S.get_damage())
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
|
||||
@@ -144,7 +163,7 @@
|
||||
return FALSE
|
||||
|
||||
if (isipc(M))
|
||||
var/obj/item/organ/internal/surge/s = M.internal_organs_by_name["surge"]
|
||||
var/obj/item/organ/internal/machine/surge/s = M.internal_organs_by_name[BP_SURGE_PROTECTOR]
|
||||
if(isnull(s))
|
||||
user.visible_message(
|
||||
SPAN_NOTICE("[user] is trying to apply [src] to [(M == user) ? ("itself") : (M)]!"),
|
||||
@@ -154,9 +173,9 @@
|
||||
if (!do_mob(user, M, 2))
|
||||
return FALSE
|
||||
|
||||
s = new /obj/item/organ/internal/surge()
|
||||
s = new /obj/item/organ/internal/machine/surge()
|
||||
M.internal_organs += s
|
||||
M.internal_organs_by_name["surge"] = s
|
||||
M.internal_organs_by_name[BP_SURGE_PROTECTOR] = s
|
||||
user.visible_message(
|
||||
SPAN_NOTICE("[user] applies some nanite paste to [(M == user) ? ("itself") : (M)]!"),
|
||||
SPAN_NOTICE("You apply [src] to [(M == user) ? ("youself") : (M)].")
|
||||
|
||||
@@ -68,11 +68,11 @@
|
||||
/obj/item/implanter/ipc_tag
|
||||
name = "IPC tag implanter"
|
||||
desc = "A special implanter used for implanting synthetics with a special tag."
|
||||
var/obj/item/organ/internal/ipc_tag/ipc_tag
|
||||
var/obj/item/organ/internal/machine/ipc_tag/ipc_tag
|
||||
|
||||
/obj/item/implanter/ipc_tag/Initialize()
|
||||
. = ..()
|
||||
ipc_tag = new /obj/item/organ/internal/ipc_tag(src)
|
||||
ipc_tag = new /obj/item/organ/internal/machine/ipc_tag(src)
|
||||
update_icon()
|
||||
|
||||
/obj/item/implanter/ipc_tag/update_icon()
|
||||
@@ -121,7 +121,7 @@
|
||||
ipc_tag = null
|
||||
update_icon()
|
||||
return
|
||||
if(istype(attacking_item, /obj/item/organ/internal/ipc_tag))
|
||||
if(istype(attacking_item, /obj/item/organ/internal/machine/ipc_tag))
|
||||
if(ipc_tag)
|
||||
to_chat(user, SPAN_WARNING("\The [src] already has an IPC tag loaded."))
|
||||
return
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
to_chat(user, SPAN_WARNING("You analyze \the [target_mob], but find that they're not an IPC at all!"))
|
||||
return
|
||||
var/mob/living/carbon/human/IPC = target_mob
|
||||
var/obj/item/organ/internal/ipc_tag/tag = IPC.internal_organs_by_name[BP_IPCTAG]
|
||||
var/obj/item/organ/internal/machine/ipc_tag/tag = IPC.internal_organs_by_name[BP_IPCTAG]
|
||||
if(isnull(tag) || !tag)
|
||||
to_chat(user, SPAN_WARNING("Error: Serial Identification Missing."))
|
||||
return
|
||||
|
||||
@@ -11,16 +11,17 @@
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 50)
|
||||
recyclable = TRUE
|
||||
|
||||
/// Note %age converted to actual charge in New()
|
||||
var/charge = 0
|
||||
var/maxcharge = 2500
|
||||
/// Maximum cell charge.
|
||||
var/maxcharge = 1000
|
||||
/// True if rigged to explode
|
||||
var/rigged = FALSE
|
||||
/// If not 100% reliable, it will build up faults.
|
||||
var/minor_fault = 0
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 50)
|
||||
recyclable = TRUE
|
||||
|
||||
/// Percentage of maxcharge to recharge per minute, though it will trickle charge every process tick (every ~2 seconds), leave null for no self-recharge
|
||||
var/self_charge_percentage
|
||||
|
||||
@@ -126,10 +127,10 @@
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 80)
|
||||
|
||||
/obj/item/cell/infinite/check_charge()
|
||||
return 1
|
||||
return 1
|
||||
|
||||
/obj/item/cell/infinite/use()
|
||||
return 1
|
||||
return 1
|
||||
|
||||
/obj/item/cell/potato
|
||||
name = "potato battery"
|
||||
@@ -139,8 +140,6 @@
|
||||
icon_state = "potato_cell" //"potato_battery"
|
||||
charge = 100
|
||||
maxcharge = 300
|
||||
minor_fault = 1
|
||||
|
||||
|
||||
/obj/item/cell/slime
|
||||
name = "charged slime core"
|
||||
|
||||
@@ -355,6 +355,30 @@
|
||||
/obj/proc/do_signaler()
|
||||
return
|
||||
|
||||
|
||||
/**
|
||||
* Called when an access cable - from an IPC or from a roboticist tool - is inserted into an object.
|
||||
*/
|
||||
/obj/proc/insert_cable(obj/item/access_cable/cable, mob/user)
|
||||
user.drop_from_inventory(cable)
|
||||
cable.forceMove(src)
|
||||
cable.target = src
|
||||
|
||||
/**
|
||||
* Called when an access cable is removed from something, forcibly or not.
|
||||
* Override as needed to clear variables up.
|
||||
*/
|
||||
/obj/proc/remove_cable(obj/item/access_cable/cable)
|
||||
SHOULD_CALL_PARENT(TRUE)
|
||||
cable.target = null
|
||||
|
||||
/**
|
||||
* Called when an access cable - from an IPC or from a roboticist tool - is used on an object to interact with it.
|
||||
* For example, brings up diagnostics for an access port if it's hooked into one.
|
||||
*/
|
||||
/obj/proc/cable_interact(obj/item/access_cable/cable, mob/user)
|
||||
return
|
||||
|
||||
/*#############################################
|
||||
PERSISTENT
|
||||
#############################################*/
|
||||
|
||||
@@ -73,6 +73,7 @@
|
||||
new /obj/item/storage/belt/utility(src)
|
||||
new /obj/item/storage/belt/utility/alt(src)
|
||||
new /obj/item/storage/toolbox/mechanical(src)
|
||||
new /obj/item/modular_computer/laptop/preset/supply/robotics(src)
|
||||
|
||||
// Miner
|
||||
/obj/structure/closet/secure_closet/miner
|
||||
|
||||
@@ -49,6 +49,7 @@
|
||||
new /obj/item/device/taperecorder(src)
|
||||
new /obj/item/sampler(src)
|
||||
new /obj/item/storage/box/shells/tranquilizer(src)
|
||||
new /obj/item/modular_computer/laptop/preset/supply/robotics(src)
|
||||
|
||||
/// Used for when we want to populate the contents of this locker ourself. Good for away sites
|
||||
/obj/structure/closet/secure_closet/RD/empty
|
||||
|
||||
Reference in New Issue
Block a user