From e2a7a630eef8220fca30f0885793cc0bc568e2cb Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed, 18 Nov 2020 13:06:13 -0500 Subject: [PATCH] Allows doctors to eject cloning pods, activates the radio cloners have. (#14891) * True / false, enables the radio cloners have, swap access * Fixes it --- code/game/machinery/cloning.dm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 3ddc66c386c..98edf130d94 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -22,19 +22,19 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ #define BRAIN_INITIAL_DAMAGE 90 // our minds are too feeble for 190 /obj/machinery/clonepod - anchored = 1 + anchored = TRUE name = "cloning pod" desc = "An electronically-lockable pod for growing organic tissue." - density = 1 + density = TRUE icon = 'icons/obj/cloning.dmi' icon_state = "pod_idle" - req_access = list(ACCESS_GENETICS) //For premature unlocking. + req_access = list(ACCESS_MEDICAL) //For premature unlocking. var/mob/living/carbon/human/occupant var/heal_level //The clone is released once its health reaches this level. var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. - var/mess = 0 //Need to clean out it if it's full of exploded clone. - var/attempting = 0 //One clone attempt at a time thanks + var/mess = FALSE //Need to clean out it if it's full of exploded clone. + var/attempting = FALSE //One clone attempt at a time thanks var/biomass = 0 var/speed_coeff var/efficiency @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ var/grab_ghost_when = CLONER_MATURE_CLONE var/obj/item/radio/Radio - var/radio_announce = 0 + var/radio_announce = TRUE var/obj/effect/countdown/clonepod/countdown @@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ name = "Cloning Data Disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. var/datum/dna2/record/buf = null - var/read_only = 0 //Well,it's still a floppy disk + var/read_only = FALSE //Well,it's still a floppy disk /obj/item/disk/data/proc/initialize() buf = new @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ /obj/item/disk/data/demo name = "data disk - 'God Emperor of Mankind'" - read_only = 1 + read_only = TRUE /obj/item/disk/data/demo/New() ..() @@ -213,7 +213,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ /obj/machinery/clonepod/proc/spooky_devil_flavor() playsound(loc, pick('sound/goonstation/voice/male_scream.ogg', 'sound/goonstation/voice/female_scream.ogg'), 100, 1) - mess = 1 + mess = TRUE update_icon() connected_message("If you keep trying to steal from me, you'll end up with me.") @@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ else return 0 - attempting = 1 //One at a time!! + attempting = TRUE //One at a time!! countdown.start() if(!R.dna) @@ -311,8 +311,8 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ update_icon() - H.suiciding = 0 - attempting = 0 + H.suiciding = FALSE + attempting = FALSE return 1 //Grow clones to maturity then kick them out. FREELOADERS @@ -469,13 +469,13 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ //Put messages in the connected computer's temp var for display. /obj/machinery/clonepod/proc/connected_message(message) if((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning))) - return 0 + return FALSE if(!message) - return 0 + return FALSE connected.temp = "[name] : [message]" connected.updateUsrDialog() - return 1 + return TRUE /obj/machinery/clonepod/proc/go_out() countdown.stop()