[MODULAR] IRCD removal, Improved RCD added, also featuring, the AFAD (#15105)

* Update packs.dm

* Create AFAD.dm

* forgot not to capitalize

* Create improvedRCD

* Update improvedRCD

* Update improvedRCD

* hit enter to early

* forgot this before testing

* Update goodies.dm

* Update tgstation.dme

* Update improvedRCD.dm

* Update AFAD.dm

* price re-adjustment, IRCD value pack

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update improvedRCD.dm

* Update AFAD.dm

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Update goodies.dm

* Update goodies.dm

* Update AFAD.dm

* Update goodies.dm

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update AFAD.dm

* more-cheaply

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

modular_skyrat/modules/cargo/code/goodies.dm

@@ -23,6 +23,27 @@
 	contains = list(/obj/item/tank/internals/plasmaman/belt,
                     /obj/item/clothing/mask/breath)
 
+/*
+*	ENGINEERING STUFF
+*/
+
+/datum/supply_pack/goody/improvedrcd
+	name = "Improved RCD"
+	desc = "An upgraded RCD featuring superior material storage. Comes with complimentary frames and circuitry upgrades to boot!"
+	cost = PAYCHECK_CREW * 38
+	contains = list(/obj/item/construction/rcd/improved)
+	
+	
+/datum/supply_pack/goody/improvedrcdbonus
+	name = "Improved RCD  Value Pack"
+	desc = "A pack of 3 upgraded RCDs featuring superior material storage. Each comes with complimentary frames and circuitry upgrades to boot!"
+	cost = PAYCHECK_CREW * 100
+	contains = list(
+		/obj/item/construction/rcd/improved,
+		/obj/item/construction/rcd/improved,
+		/obj/item/construction/rcd/improved,
+	)
+
 /*
 *	MISC
 */
@@ -111,3 +132,13 @@
 	name = "Blue Carpet Single-Pack"
 	contains = list(/obj/item/stack/tile/carpet/blue/fifty)
 
+/*
+*	MEDICAL STUFF
+*/
+
+
+/datum/supply_pack/goody/afad
+	name = "Automated First Aid Device"
+	desc = "Someone mildly hurt and it's too much of a bother to manually handle their burns or cuts? Look no further than the AFAD, a state-of-the-art pain-relief device!"
+	cost = PAYCHECK_CREW * 40
+	contains = list(/obj/item/gun/medbeam/afad)

modular_skyrat/modules/cargo/code/items/AFAD.dm

@@ -0,0 +1,21 @@
+#define PHYSICAL_DAMAGE_HEALING -0.2
+#define EXOTIC_DAMAGE_HEALING -0.1
+
+/obj/item/gun/medbeam/afad
+	name = "Automated First Aid Device"
+	desc = "Usually supplied in medkits, the AFAD is a revolutionary device meant for fixing scrapes and bruises, and totally not a knockoff of the legendary medibeam. A label on the underside reminds you not to cross the beams."
+	icon = 'icons/obj/chronos.dmi'
+	icon_state = "chronogun"
+	inhand_icon_state = "chronogun"
+	w_class = WEIGHT_CLASS_NORMAL
+
+	
+
+/obj/item/gun/medbeam/afad/on_beam_tick(mob/living/target)
+	if(target.health != target.maxHealth)
+		new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
+	target.adjustBruteLoss(PHYSICAL_DAMAGE_HEALING)
+	target.adjustFireLoss(PHYSICAL_DAMAGE_HEALING)
+	target.adjustToxLoss(EXOTIC_DAMAGE_HEALING)
+	target.adjustOxyLoss(EXOTIC_DAMAGE_HEALING)
+	return

modular_skyrat/modules/cargo/code/items/improvedRCD.dm

@@ -0,0 +1,10 @@
+// Slightly improved version of the normal RCD, mostly as an engineering 'I got hella bread' purchase
+/obj/item/construction/rcd/improved
+	name = "Improved RCD"
+	desc = "A device used to rapidly build and deconstruct. Upgraded from the standard model with superior material storage, at the cost of build speed. Reload with iron, plasteel, glass or compressed matter cartridges."
+	icon_state = "ircd"
+	inhand_icon_state = "ircd"
+	max_matter = 220
+	matter = 220
+	delay_mod = 1.3
+	upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS

modular_skyrat/modules/cargo/code/packs.dm

@@ -150,16 +150,6 @@
 *	ENGINEERING
 */
 
-/datum/supply_pack/engineering/industrial_rcd
-	name = "Industrial RCD Crate"
-	desc = "Manufactured at a high-tech NT production facility, this pack contains 2 industrial RCDs with expanded matter reserves and upgraded deconstructors. Requires CE Access to open."
-	access = ACCESS_CE //These contain all upgrades and ~2.5x as much matter. The least we can do is lock it behind CE.
-	contains = list(/obj/item/construction/rcd/combat,
-					/obj/item/construction/rcd/combat)
-	cost = CARGO_CRATE_VALUE * 40
-	crate_name = "industrial RCD crate"
-	crate_type = /obj/structure/closet/crate/secure/engineering
-
 /datum/supply_pack/engineering/material_pouches
 	name = "Material Pouches Crate"
 	desc = "Contains three material pouches."
@@ -286,22 +276,6 @@
 					/obj/item/storage/box/matches)
 	crate_name = "candle crate"
 
-/*
-/datum/supply_pack/misc/jukebox
-	name = "Jukebox Crate"
-	desc = "Contains a regular old jukebox. It can play music!"
-	cost = CARGO_CRATE_VALUE * 20
-	contains = list(/obj/machinery/jukebox)
-	crate_name = "jukebox crate"
-
-/datum/supply_pack/misc/jukebox_disco
-	name = "Radiant Dance Machine Crate"
-	desc = "Contains the new and improved Radiant Dance Machine Mark IV! Capable of playing a large selections of music, while projecting a fabulous lightshow."
-	cost = CARGO_CRATE_VALUE * 50
-	contains = list(/obj/machinery/jukebox/disco)
-	crate_name = "dance machine crate"
-*/
-
 
 /datum/supply_pack/service/snowmobile
 	name = "Snowmobile kit"

tgstation.dme

@@ -5139,6 +5139,8 @@
 #include "modular_skyrat\modules\bulletrebalance\code\sniper.dm"
 #include "modular_skyrat\modules\cargo\code\goodies.dm"
 #include "modular_skyrat\modules\cargo\code\packs.dm"
+#include "modular_skyrat\modules\cargo\code\items\AFAD.dm"
+#include "modular_skyrat\modules\cargo\code\items\improvedRCD.dm"
 #include "modular_skyrat\modules\cargo_teleporter\code\cargo_teleporter.dm"
 #include "modular_skyrat\modules\cargoborg\code\robot_items.dm"
 #include "modular_skyrat\modules\cargoborg\code\robot_modules.dm"