Augments enchanced [WIP]

code/__DEFINES/DNA.dm

@@ -203,6 +203,8 @@
 
 //implants
 #define ORGAN_SLOT_BRAIN_IMPLANT "brain_implant"
+#define ORGAN_SLOT_NEURALWARE "neuralware"  //dripstation edit
+#define ORGAN_SLOT_BATTERY "battery"  //dripstation edit
 #define ORGAN_SLOT_HUD "eye_hud"
 #define ORGAN_SLOT_BREATHING_TUBE "breathing_tube"
 #define ORGAN_SLOT_TORSO_IMPLANT "torso_implant"

code/modules/surgery/organs/augments_chest.dm

@@ -229,6 +229,7 @@
 	var/on = FALSE
 	var/time_on = 0
 	var/hasexerted = FALSE
+	var/cooling_modifier = 2	//dripstation edit
 	COOLDOWN_DECLARE(alertcooldown)
 	COOLDOWN_DECLARE(startsoundcooldown)
 	COOLDOWN_DECLARE(endsoundcooldown)
@@ -311,7 +312,10 @@
 				to_chat(owner, span_userdanger("You feel a slight sense of shame as your brain and spine rip themselves apart from overexertion."))
 				owner.gib()
 	else
+/*	dripstation edit start
 		time_on -= 2
+*/
+		time_on -= cooling_modifier	//dripstation edit end
 
 	time_on = max(time_on, 0)
 	if(hasexerted && time_on == 0)

code/modules/surgery/organs/lungs.dm

@@ -228,12 +228,14 @@
 			H.Unconscious(60) // 60 gives them one second to wake up and run away a bit!
 			if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
 				H.Sleeping(max(H.AmountSleeping() + 40, 200))
+				ADD_TRAIT(owner, TRAIT_SURGERY_PREPARED, GAS_NITROUS)	//dripstation fix
 		else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
 			if(prob(20))
 				H.emote(pick("giggle", "laugh"))
 				SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "chemical_euphoria", /datum/mood_event/chemical_euphoria)
 		else
 			SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "chemical_euphoria")
+			REMOVE_TRAIT(owner, TRAIT_SURGERY_PREPARED, GAS_NITROUS)	//dripstation fix
 
 
 	// BZ

modular_dripstation/code/modules/surgery/organs/augments_arms.dm

@@ -0,0 +1,132 @@
+/obj/item/organ/cyberimp/arm/toolset
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "multitool_utility"
+
+/obj/item/organ/cyberimp/arm/toolset/surgery
+	icon_state = "multitool_medical"
+
+/obj/item/organ/cyberimp/arm/toolset/janitorial
+	name = "janitor toolset implant"
+	desc = "A set of janitor tools hidden behind a concealed panel on the user's arm."
+	icon_state = "multitool"
+	contents = newlist(/obj/item/mop/advanced, /obj/item/soap, /obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner)
+
+/obj/item/organ/internal/cyberimp/arm/hacking
+	name = "hacking arm implant"
+	desc = "A small arm implant containing an advanced screwdriver, combat wrench and multitool designed for combat engineers and on-the-field machine modification."
+	icon_state = "multitool_syndicate"
+	contents = newlist(/obj/item/screwdriver/nuke/hacking, /obj/item/wrench/combat, /obj/item/jawsoflife/syndicate, /obj/item/multitool/ai_detect/red)
+
+/obj/item/screwdriver/nuke/hacking
+	toolspeed = 0.33
+
+/obj/item/organ/cyberimp/arm/esword
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "arm_energy"
+	contents = newlist(/obj/item/melee/transforming/energy/blade)
+	syndicate_implant = TRUE
+
+/obj/item/melee/transforming/energy/blade
+	lefthand_file = 'modular_dripstation/icons/mob/inhands/augment_lefthand.dmi'
+	righthand_file = 'modular_dripstation/icons/mob/inhands/augment_righthand.dmi'
+
+/obj/item/organ/cyberimp/arm/hardlight
+	name = "arm-mounted hardlight blade"
+	desc = "Combat arm with highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "arm_hardlight"
+	contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight)
+
+/obj/item/organ/cyberimp/arm/hardlight/stealth
+	syndicate_implant = TRUE
+
+/obj/item/organ/cyberimp/arm/medibeam
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "multitool_syndicatemedical"
+
+/obj/item/organ/cyberimp/arm/flash
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "arm_flash"
+
+/obj/item/organ/cyberimp/arm/flash/rev
+	icon_state = "arm_revflash"
+
+/obj/item/organ/cyberimp/arm/baton
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "arm_baton"
+
+/obj/item/organ/cyberimp/arm/combat
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "multitool_combat"
+
+/obj/item/organ/cyberimp/arm/syndie_mantis
+	desc = "Modernized mantis blades designed and coined by Gorlex operatives. Energy actuators makes the blade a much deadlier weapon and provides protection."
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "mantis_syndicate"
+
+/obj/item/organ/cyberimp/arm/nt_mantis
+	name = "N.A.N.O. mantis blade implants"
+	desc = "Retractable arm-blade implants to get you out of a pinch. This one provides extra wound chances.  Wielding two will let you double-attack."
+	contents = newlist(/obj/item/mantis/blade/NT)
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "mantis_militech"
+
+/obj/item/organ/cyberimp/arm/militech_mantis
+	name = "H.E.P.H.A.E.S.T.U.S. mantis blade implants"
+	desc = "Retractable arm-blade implants to get you out of a pinch. This one provides extra toolspeed and damage. Wielding two will let you double-attack."
+	contents = newlist(/obj/item/mantis/blade/hepestus)
+
+/obj/item/organ/cyberimp/arm/blade
+	name = "unbranded mantis blade implants"
+	desc = "Retractable arm-blade implants to get you out of a pinch. Wielding two will let you double-attack."
+	contents = newlist(/obj/item/mantis/blade)
+
+/obj/item/organ/cyberimp/arm/shellguard_mantis
+	name = "S.H.E.L.L. mantis blade implants"
+	desc = "Retractable arm-blade implants to get you out of a pinch. This one provides extra protection. Wielding two will let you double-attack."
+	contents = newlist(/obj/item/mantis/blade/shellguard)
+
+/obj/item/organ/cyberimp/arm/hfreq_mantis
+	name = "S.H.E.L.L. mantis blade implants"
+	desc = "Retractable arm-blade implants to get you out of a pinch. This one provides better armor penetration. Wielding two will let you double-attack."
+	contents = newlist(/obj/item/mantis/blade/hfreq)
+
+/obj/item/mantis/blade
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	lefthand_file = 'modular_dripstation/icons/mob/inhands/augment_lefthand.dmi'
+	righthand_file = 'modular_dripstation/icons/mob/inhands/augment_righthand.dmi'
+	icon_state = "mantis"
+	force = 18
+
+/obj/item/mantis/blade/NT
+	name = "N.A.N.O. mantis blade"
+	icon_state = "mantis"
+	wound_bonus = 30
+
+/obj/item/mantis/blade/hepestus
+	name = "H.E.P.H.A.E.S.T.U.S. mantis blade"
+	icon_state = "mantis_militech"
+	force = 24
+	toolspeed = 0.2
+
+/obj/item/mantis/blade/shellguard
+	name = "S.H.E.L.L. mantis blade"
+	icon_state = "mantis_shellguard"
+	block_chance = 30
+
+/obj/item/mantis/blade/hfreq
+	name = "high frequency mantis blade"
+	armour_penetration = 50
+	icon_state = "mantis_hfreq"
+
+/obj/item/mantis/blade/syndicate
+	icon_state = "mantis_syndicate"
+	force = 20
+
+/obj/item/organ/cyberimp/arm/stechkin_implant
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "popout_stechkin"
+
+/obj/item/gun/ballistic/automatic/pistol/implant
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "popout_stechkin"

modular_dripstation/code/modules/surgery/organs/augments_chest.dm

@@ -0,0 +1,10 @@
+/obj/item/organ/cyberimp/chest/spinalspeed
+	name = "combat neural overclocker implant"
+	desc = "Stimulates your central nervous system in order to enable you to perform muscle movements faster. Careful not to overuse it. Version with better cooling and emp protection."
+	icon_state = "imp_spinal"
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	cooling_modifier = 3
+
+/obj/item/organ/cyberimp/chest/spinalspeed/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_EMPPROOF_SELF, "innate_empproof")

modular_dripstation/code/modules/surgery/organs/augments_eyes.dm

@@ -0,0 +1,18 @@
+/obj/item/organ/cyberimp/eyes/hud
+	icon_state = "eye"
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+
+/obj/item/organ/cyberimp/eyes/hud/medical
+	icon_state = "eye_medical"
+
+/obj/item/organ/cyberimp/eyes/hud/security
+	icon_state = "eye_security"
+
+/obj/item/organ/cyberimp/eyes/hud/diagnostic
+	icon_state = "eye_diagnostic"
+
+/obj/item/organ/cyberimp/eyes/hud/security/syndicate
+	icon_state = "eye_syndicate"
+
+/obj/item/organ/cyberimp/eyes/hud/science
+	icon_state = "eye_science"

modular_dripstation/code/modules/surgery/organs/augments_internal.dm

@@ -0,0 +1,31 @@
+
+/obj/item/organ/cyberimp
+	var/status = FALSE
+	var/complexyty = 1
+
+
+//[[[[NEURAL]]]]
+
+/obj/item/organ/cyberimp/neural_link
+	name = "basic neural link"
+	desc = "Neural link is critical for linking cybernetics to the central nervous system. Uses nanotech to establish an interface between the module and the nervous system in the body."
+	icon_state = "brain_implant"
+	implant_overlay = "brain_implant_overlay"
+	slot = ORGAN_SLOT_NEURALWARE
+	zone = BODY_ZONE_HEAD
+	w_class = WEIGHT_CLASS_TINY
+	complexyty = 0
+	var/complexyty_holding = 5
+
+/obj/item/organ/cyberimp/neural_link/emp_act(severity)
+	. = ..()
+	if(!owner || . & EMP_PROTECT_SELF)
+		return
+	switch severity
+		if(1)
+			owner.apply_damage(10, STAMINA)
+			owner.adjust_confusion(rand(2 SECONDS, 3 SECONDS))
+		if(2)
+			owner.flash_act()
+			owner.apply_damage(20, STAMINA)
+			owner.adjust_confusion(rand(4 SECONDS, 6 SECONDS))

modular_dripstation/code/modules/surgery/organs/augments_legs.dm

@@ -0,0 +1,3 @@
+/obj/item/organ/cyberimp/leg
+	icon = "modular_dripstation/icons/obj/augments.dmi"
+	icon_state = "circuit"

modular_dripstation/includes.dm

@@ -403,6 +403,10 @@
 #include "code\modules\surgery\anasthesia_machine.dm"
 #include "code\modules\surgery\surgery_step.dm"
 #include "code\modules\surgery\organs\autosurgeon.dm"
+#include "code\modules\surgery\organs\augments_arms.dm"
+#include "code\modules\surgery\organs\augments_chest.dm"
+#include "code\modules\surgery\organs\augments_eyes.dm"
+#include "code\modules\surgery\organs\augments_legs.dm"
 #include "code\modules\surgery\tools.dm"
 #include "code\modules\uplink\uplink_devices.dm"
 #include "code\modules\uplink\uplink_items.dm"