From ecb08d0c4633dca1920b9875b154dbea29311991 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 11 Mar 2013 18:20:02 +0100 Subject: [PATCH] Cloning now requires meat for biomass. --- code/game/jobs/departments.dm | 1 + code/game/machinery/cloning.dm | 8 ++++++++ code/game/machinery/computer/cloning.dm | 15 +++++++++++++-- html/changelog.html | 8 ++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 code/game/jobs/departments.dm diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm new file mode 100644 index 00000000000..f424d03a1a3 --- /dev/null +++ b/code/game/jobs/departments.dm @@ -0,0 +1 @@ +var/list/departments = list("Command", "Medical", "Engineering", "Security", "Civilian", "Cargo") \ No newline at end of file diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 8c22b202eb9..544d3b0d068 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -3,6 +3,8 @@ //Potential replacement for genetics revives or something I dunno (?) +#define CLONE_BIOMASS 150 + /obj/machinery/clonepod anchored = 1 name = "cloning pod" @@ -18,6 +20,7 @@ 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/eject_wait = 0 //Don't eject them as soon as they are created fuckkk + var/biomass = CLONE_BIOMASS //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. @@ -271,6 +274,11 @@ src.locked = 0 src.go_out() return + else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) + biomass += 50 + user.drop_item() + del(W) + return else ..() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index dc802261657..80796e663cc 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -202,6 +202,9 @@ dat += "Lock status: [src.scanner.locked ? "Locked" : "Unlocked"]
" + if (!isnull(src.pod1)) + dat += "Biomass: [src.pod1.biomass]
" + // Database dat += "

Database Functions

" dat += "View Records
" @@ -243,8 +246,12 @@ dat += "
" //Keeping a line empty for appearances I guess. dat += {"UI: [src.active_record.fields["UI"]]
- SE: [src.active_record.fields["SE"]]

- Clone
"} + SE: [src.active_record.fields["SE"]]

"} + + if(pod1 && pod1.biomass >= CLONE_BIOMASS) + dat += {"Clone
"} + else + dat += {"Unsufficient biomass
"} if(4) if (!src.active_record) @@ -378,6 +385,8 @@ temp = "Error: No Clonepod detected." else if(pod1.occupant) temp = "Error: Clonepod is currently occupied." + else if(pod1.biomass < CLONE_BIOMASS) + temp = "Error: Not enough biomass." else if(pod1.mess) temp = "Error: Clonepod malfunction." else if(!config.revival_cloning) @@ -389,6 +398,8 @@ del(C) menu = 1 else + pod1.biomass -= CLONE_BIOMASS + var/mob/selected = find_dead_player("[C.fields["ckey"]]") selected << 'chime.ogg' //probably not the best sound but I think it's reasonable var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") diff --git a/html/changelog.html b/html/changelog.html index 59b1706ddb9..90544e46d1d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,14 @@ should be listed in the changelog upon commit though. Thanks. --> +
+

March 11th 2013

+

CIB updated:

+ +
+

March 9th 2013

Cael Aislinn updated: