Cloning Rework (ParadiseSS13#21683)

* guts the cloning pod * guts cloning console (except the tgui) * clonescanner, more gutting, linkage * reagent stuff * `cloning_data` datum * scanner inserting/removing * scanning logic * auto-linkage * `get_cloning_cost()` in its entirety * logic for which limbs to grow * RefreshParts() and insert_organ() * removes misinformation * robot parts * more organ insertion logic * more organ code :D * create_clone * beginnings of clone logic * cloning addl. stuff * cloning finalization * fixes CI? * whitespace fixes (regex edition) * ejection logic * Update code/game/machinery/clonepod.dm Co-authored-by: Nathan Winters <[email protected]> * stuff * stuff 2 * update_icon_state stuff * clonepod TGUI * organ fix yipee * cloning console UI beginnings * cloning console main menu * reagents stuff * beginning of damage tab * damages menu skeleton * aiuhgugh * splits up code * ejecting patient updates ui * contra reviews * temp fix for CI * tgui finished? (clueless) * Cloning :D it's done * manual & tweaks * more feedback! * cooldown because you can spam the fuck out if it otherwise and it's really loud for the ghost * oops * tweaks * edits EVERY MAP OH GOD * no link stuff * oops * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Burzah <[email protected]> * Apply suggestions from code review (pt. 2) Co-authored-by: Henri215 <[email protected]> Co-authored-by: Burzah <[email protected]> * Update code/game/machinery/computer/cloning.dm Co-authored-by: Henri215 <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * dgamer review * Update code/game/machinery/clonepod.dm Co-authored-by: DGamerL <[email protected]> * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> * henri stuff * makes it compile * builds tgui (oops) * rebuilt bundle i guess? * not stale i swear * fixes * whoops * countdown stuff * sirryan review pt. 1 * sirryan review pt 2 * every day i'm shuffling (or something idk) * wasdfhdfg * sean clonepod.dm changes * update_icon(UPDATE_ICON_STATE) * Update code/game/machinery/clonescanner.dm Co-authored-by: S34N <[email protected]> * icon stuff * map weirdness * henri disks * unfucks maps? * cc maps * eject button * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Update code/game/machinery/clonepod.dm Co-authored-by: DGamerL <[email protected]> * dgamer review 2 * ourgh * dgamer review 3 * waaaah * fixes access locks * fixes Fixes the numbers issues (and no feet hopefully?) * re-adds feet * more fixes yipee * un-biomass * fixes ghost stuff * exploit fix --------- Co-authored-by: Nathan Winters <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: S34N <[email protected]>
ItsMarmite · Mar 16, 2024 · 0c25bf4 · 0c25bf4
1 parent 08f9a81
commit 0c25bf4
Show file tree

Hide file tree

Showing 22 changed files with 1,984 additions and 1,429 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -81719,7 +81719,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "nsl" = (
-/obj/machinery/clonepod/biomass,
+/obj/machinery/clonepod,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -93376,7 +93376,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "udS" = (
-/obj/machinery/dna_scannernew,
+/obj/machinery/clonescanner,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -37480,13 +37480,13 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/medmaint)
 "cAj" = (
-/obj/machinery/clonepod/biomass,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
 /obj/effect/turf_decal/siding{
 	dir = 5
 	},
+/obj/machinery/clonepod,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -39927,13 +39927,13 @@
 /turf/simulated/floor/engine,
 /area/station/science/xenobiology)
 "cIR" = (
-/obj/machinery/dna_scannernew,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/siding{
 	dir = 1
 	},
+/obj/machinery/clonescanner,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -41182,7 +41182,7 @@
 	network = list("SS13","CMO")
 	},
 /obj/machinery/light,
-/obj/machinery/dna_scannernew,
+/obj/machinery/clonescanner,
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
 	},

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -32052,14 +32052,14 @@
 /turf/simulated/floor/plating,
 /area/station/science/genetics)
 "bXO" = (
-/obj/machinery/dna_scannernew,
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/machinery/status_display{
 	layer = 4;
 	pixel_x = 32
 	},
+/obj/machinery/clonescanner,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -32980,10 +32980,10 @@
 	},
 /area/station/medical/cloning)
 "caN" = (
-/obj/machinery/clonepod/biomass,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/machinery/clonepod,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},

diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
@@ -3854,7 +3854,6 @@
 /area/abductor_ship)
 "mX" = (
 /obj/machinery/door/window{
-	dir = 2;
 	name = "Cockpit";
 	req_access_txt = "150"
 	},
@@ -4139,15 +4138,11 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/syndicate_mothership)
 "nN" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/corner,
 /turf/simulated/floor/plating/airless,
 /area/syndicate_mothership)
 "nO" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating/airless,
 /area/syndicate_mothership)
 "nP" = (
@@ -4554,10 +4549,10 @@
 /turf/simulated/floor/carpet/purple,
 /area/wizard_station)
 "pq" = (
-/obj/machinery/clonepod/upgraded,
 /obj/machinery/light/spot{
 	dir = 1
 	},
+/obj/machinery/clonepod/upgraded,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "pr" = (
@@ -4908,8 +4903,7 @@
 "qJ" = (
 /obj/structure/table,
 /obj/machinery/door/window/classic/normal{
-	name = "security checkpoint";
-	dir = 2
+	name = "security checkpoint"
 	},
 /turf/simulated/floor/carpet,
 /area/admin)
@@ -5054,6 +5048,10 @@
 /obj/structure/coatrack,
 /turf/simulated/floor/wood,
 /area/ghost_bar)
+"rg" = (
+/obj/machinery/clonescanner,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/administration)
 "rh" = (
 /obj/machinery/economy/vending/liberationstation,
 /turf/simulated/floor/plasteel,
@@ -7907,9 +7905,7 @@
 /turf/simulated/floor/wood,
 /area/ghost_bar)
 "Cl" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating/airless,
 /area/centcom/control)
 "Cm" = (
@@ -8480,7 +8476,6 @@
 /area/holodeck/source_basketball)
 "Ej" = (
 /obj/machinery/door/window/reinforced/normal{
-	dir = 2;
 	name = "Cell Door";
 	req_access_txt = "150"
 	},
@@ -11381,9 +11376,7 @@
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "Of" = (
@@ -14331,8 +14324,7 @@
 "YJ" = (
 /obj/machinery/door/window/classic/normal{
 	name = "Cell B";
-	req_access_txt = "101";
-	dir = 2
+	req_access_txt = "101"
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/admin)
@@ -28037,7 +28029,7 @@ ZN
 ZN
 Ek
 ZG
-km
+rg
 lr
 lr
 Sx

diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm
@@ -97,7 +97,7 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "aB" = (
-/obj/machinery/dna_scannernew,
+/obj/machinery/clonescanner,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "aC" = (
@@ -585,12 +585,10 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "ip" = (
-/obj/machinery/clonepod{
-	biomass = 300
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/clonepod/upgraded,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "kY" = (

diff --git a/code/__DEFINES/cloning_defines.dm b/code/__DEFINES/cloning_defines.dm
@@ -0,0 +1,13 @@
+//Defines used to pass info between the scanner and cloning console
+#define SCANNER_UNCLONEABLE_SPECIES "uncloneable"
+#define SCANNER_HUSKED "husked"
+#define SCANNER_ABSORBED "absorbed"
+#define SCANNER_NO_SOUL "soulless"
+#define SCANNER_BRAIN_ISSUE "suicide or missing brain"
+#define SCANNER_MISC "miscellanious"
+#define SCANNER_SUCCESSFUL "successful"
+
+//Defines used to make the return value of a get_cloning_cost() operation more readable
+#define BIOMASS_COST 1
+#define SANGUINE_COST 2
+#define OSSEOUS_COST 3