From 2cab399c3537f11046e322bb2f17ce1b40f0f4c8 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:45:46 +0100 Subject: [PATCH 01/14] Frostbite jelly --- code/game/objects/items/devices/suit_cooling.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index f4787ff83d..7577527f2a 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -237,3 +237,17 @@ if(cell.charge <= 0) turn_off(1) +/mob/living/simple_animal/hostile/jelly/cold //you are my test mob now fug you + name = "Frostbite Jelly" + //might make a blue icon someday, not priority this is debug stuff + var/obj/item/weapon/cell/cell + var/cooling = 5 //variable cooling + +/mob/living/simple_animal/hostile/jelly/cold/life() + ..() + if(alive) + src.bodytemperature -= cooling + + + + From f9457d1ffb359f18a810133c26f79fcd44c2dfde Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:46:40 +0100 Subject: [PATCH 02/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 7577527f2a..8bf311e220 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -240,7 +240,6 @@ /mob/living/simple_animal/hostile/jelly/cold //you are my test mob now fug you name = "Frostbite Jelly" //might make a blue icon someday, not priority this is debug stuff - var/obj/item/weapon/cell/cell var/cooling = 5 //variable cooling /mob/living/simple_animal/hostile/jelly/cold/life() From ebd62ab251f6ba84db610846ec27144148f1a2d0 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:59:30 +0100 Subject: [PATCH 03/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 8bf311e220..a52ade019d 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -244,7 +244,7 @@ /mob/living/simple_animal/hostile/jelly/cold/life() ..() - if(alive) + if(icon_state == icon_dead) src.bodytemperature -= cooling From 5200b2a6a3f23febf3e6046e92a18def14ead17a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 11:00:02 +0100 Subject: [PATCH 04/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index a52ade019d..1fcb6818a3 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -244,7 +244,7 @@ /mob/living/simple_animal/hostile/jelly/cold/life() ..() - if(icon_state == icon_dead) + if(icon_state != icon_dead) src.bodytemperature -= cooling From c7d57829085a1345ee70ccca76f9c275b0362ea8 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 11:13:12 +0100 Subject: [PATCH 05/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 1fcb6818a3..ce570a9674 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -242,7 +242,7 @@ //might make a blue icon someday, not priority this is debug stuff var/cooling = 5 //variable cooling -/mob/living/simple_animal/hostile/jelly/cold/life() +/mob/living/simple_animal/hostile/jelly/cold/Life() ..() if(icon_state != icon_dead) src.bodytemperature -= cooling From 2f7cfeb34a14e0b453ebb357204486f7e59cc468 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 11:31:39 +0100 Subject: [PATCH 06/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index ce570a9674..ffa8898d23 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -241,10 +241,14 @@ name = "Frostbite Jelly" //might make a blue icon someday, not priority this is debug stuff var/cooling = 5 //variable cooling + var/isCooling = 1 + +/mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() + isCooling=!isCooling /mob/living/simple_animal/hostile/jelly/cold/Life() ..() - if(icon_state != icon_dead) + if(icon_state != icon_dead && isCooling) src.bodytemperature -= cooling From 0020ce8faab27f8ad5fb3756cafe3970722da525 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:05:56 +0100 Subject: [PATCH 07/14] Biochemical cooling swap --- .../objects/items/devices/suit_cooling.dm | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index ffa8898d23..a61c5fcdd0 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -240,17 +240,27 @@ /mob/living/simple_animal/hostile/jelly/cold //you are my test mob now fug you name = "Frostbite Jelly" //might make a blue icon someday, not priority this is debug stuff - var/cooling = 5 //variable cooling + var/cooling = -5 //variable cooling var/isCooling = 1 -/mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() +/mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() isCooling=!isCooling +/mob/living/simple_animal/hostile/jelly/cold/handle_cooling(var/datum/gas_mixture/environment) + var/datum/gas_mixture/gas + gas = environment.remove(0.25 * environment.total_moles) + if(gas) + gas.add_thermal_energy(cooling) + environment.merge(gas) + /mob/living/simple_animal/hostile/jelly/cold/Life() ..() + var/datum/gas_mixture/environment = src.loc.return_air() if(icon_state != icon_dead && isCooling) + handle_cooling(environment) src.bodytemperature -= cooling - - - - + if(src.bodytemperature<=-500) + iscooling = 0 + if(src.bodytemperature>=-499) + iscooling = 1 + From 079c8f585043ed5512fcee3970c885b3e2bcc2ae Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:10:28 +0100 Subject: [PATCH 08/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index a61c5fcdd0..20c40ed010 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -260,7 +260,7 @@ handle_cooling(environment) src.bodytemperature -= cooling if(src.bodytemperature<=-500) - iscooling = 0 + isCooling = 0 if(src.bodytemperature>=-499) - iscooling = 1 + isCooling = 1 From c9bd87ec1f2b54a87cd711bde052ed5d4324ce36 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:12:58 +0100 Subject: [PATCH 09/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 20c40ed010..fa5ca2993e 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -246,7 +246,7 @@ /mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() isCooling=!isCooling -/mob/living/simple_animal/hostile/jelly/cold/handle_cooling(var/datum/gas_mixture/environment) +/mob/living/simple_animal/hostile/jelly/cold/proc/handle_cooling(var/datum/gas_mixture/environment) var/datum/gas_mixture/gas gas = environment.remove(0.25 * environment.total_moles) if(gas) From b0c48dfa8cdde2174a87ceaf34f163fdd2e09200 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:22:21 +0100 Subject: [PATCH 10/14] gas --- code/game/objects/items/devices/suit_cooling.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index fa5ca2993e..e769ae8ea2 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -248,10 +248,10 @@ /mob/living/simple_animal/hostile/jelly/cold/proc/handle_cooling(var/datum/gas_mixture/environment) var/datum/gas_mixture/gas - gas = environment.remove(0.25 * environment.total_moles) - if(gas) - gas.add_thermal_energy(cooling) - environment.merge(gas) + gas = environment.remove(0.25 * environment.total_moles) + if(gas) + gas.add_thermal_energy(cooling) + environment.merge(gas) /mob/living/simple_animal/hostile/jelly/cold/Life() ..() From 1d4e781a2faa46cd6d0d642044d95f70a9925af2 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:36:46 +0100 Subject: [PATCH 11/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index e769ae8ea2..cf0b629d9f 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -238,6 +238,8 @@ turn_off(1) /mob/living/simple_animal/hostile/jelly/cold //you are my test mob now fug you + hostile=0 + retaliate=1 name = "Frostbite Jelly" //might make a blue icon someday, not priority this is debug stuff var/cooling = -5 //variable cooling @@ -263,4 +265,4 @@ isCooling = 0 if(src.bodytemperature>=-499) isCooling = 1 - +//This thing is basically a cooling unit and could be used for the engine, I mean what From f8e4ed651e36675a2cbbf8e065a33708f67ba6f6 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:42:01 +0100 Subject: [PATCH 12/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index cf0b629d9f..ac3785c28d 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -244,6 +244,7 @@ //might make a blue icon someday, not priority this is debug stuff var/cooling = -5 //variable cooling var/isCooling = 1 + cold_damage_per_tick = 0 /mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() isCooling=!isCooling From 02cda221f11dfc4d2679531c100ed55c38b80e44 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 12:46:27 +0100 Subject: [PATCH 13/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index ac3785c28d..d426e286c5 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -245,6 +245,7 @@ var/cooling = -5 //variable cooling var/isCooling = 1 cold_damage_per_tick = 0 + var/maxbodytemp = 1000 /mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() isCooling=!isCooling From 0b88f8f2e340147aaee0bc1e0c239fa699f32295 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 13:38:34 +0100 Subject: [PATCH 14/14] Update suit_cooling.dm --- code/game/objects/items/devices/suit_cooling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index d426e286c5..86332035a9 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -245,7 +245,7 @@ var/cooling = -5 //variable cooling var/isCooling = 1 cold_damage_per_tick = 0 - var/maxbodytemp = 1000 + maxbodytemp = 1000 /mob/living/simple_animal/hostile/jelly/cold/proc/toggle_cooling() isCooling=!isCooling