From 8f4762e44276d2570e81beee70d4236921a7ed37 Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Mon, 11 Oct 2021 18:13:46 +0100
Subject: [PATCH 01/34] jaunting respects dense atoms on a turf too, no more AI
core jaunting
---
code/datums/spells/ethereal_jaunt.dm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 4c7c6b76b36..10438ee4925 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -55,11 +55,10 @@
sleep(jaunt_in_time)
qdel(holder)
if(!QDELETED(target))
- if(mobloc.density)
+ if(!(target.Move(mobloc)))
for(var/turf/T in orange(7))
- if(T)
- if(target.Move(T))
- break
+ if(T && target.Move(T))
+ break
target.canmove = 1
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
From 04d0fb1c1f91563f83288df5f4484cb74b25b71a Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Mon, 11 Oct 2021 20:44:21 +0100
Subject: [PATCH 02/34] non-space priority
---
code/datums/spells/ethereal_jaunt.dm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 10438ee4925..742d3a5fda1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -57,9 +57,15 @@
if(!QDELETED(target))
if(!(target.Move(mobloc)))
for(var/turf/T in orange(7))
+ if(istype(T, /turf/space))
+ continue
if(T && target.Move(T))
- break
- target.canmove = 1
+ target.canmove = 1
+ return
+ for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
+ if(target.Move(S))
+ target.canmove = 1
+ return
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
From bb89924e6ee5d7b9b20c9881fbf8da319dace376 Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Mon, 11 Oct 2021 20:48:43 +0100
Subject: [PATCH 03/34] more sanity checks
---
code/datums/spells/ethereal_jaunt.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 742d3a5fda1..85b1d967db1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -63,9 +63,9 @@
target.canmove = 1
return
for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
- if(target.Move(S))
- target.canmove = 1
- return
+ if(S && target.Move(S))
+ break
+ target.canmove = 1 //if there are no valid tiles in a range of 7, just let them spawn wherever they are currently
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
From cfc09eef49924df910e59538ed92563d3f9508f3 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 12 Oct 2021 12:17:56 +0100
Subject: [PATCH 04/34] Ion law observer message
---
code/modules/events/ion_storm.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 310bc8a1767..e9df07a8d3c 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -31,6 +31,9 @@
to_chat(M, "[message] ...LAWS UPDATED")
to_chat(M, "
")
+ for(var/player in GLOB.dead_mob_list)
+ to_chat(player, "[M] ([ghost_follow_link(M, player)]) has recieved an ion law:\n'[message]'")
+
if(botEmagChance)
for(var/mob/living/simple_animal/bot/bot in GLOB.machines)
if(prob(botEmagChance))
From eb9fede50b4099727c5283915c5f57bba5a7ca31 Mon Sep 17 00:00:00 2001
From: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:48:34 -0400
Subject: [PATCH 05/34] Still need to change filling colour of flowers
---
code/modules/hydroponics/grown/banana.dm | 12 ++++++++++--
icons/obj/hydroponics/harvest.dmi | Bin 55276 -> 59934 bytes
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index d2306a4033a..50882e31e59 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -50,6 +50,14 @@
throw_speed = 3
throw_range = 7
+/obj/item/grown/bananapeel/Initialize(mapload)
+ . = ..()
+ if(prob(40))
+ if(prob(60))
+ icon_state = "[icon_state]_2"
+ else
+ icon_state = "[icon_state]_3"
+
/obj/item/grown/bananapeel/suicide_act(mob/user)
user.visible_message("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
@@ -101,7 +109,7 @@
/obj/item/reagent_containers/food/snacks/grown/banana/bluespace
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana"
- icon_state = "banana_blue"
+ icon_state = "bluenana"
trash = /obj/item/grown/bananapeel/bluespace
filling_color = "#0000FF"
origin_tech = "biotech=3;bluespace=5"
@@ -112,7 +120,7 @@
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana peel"
desc = "A peel from a bluespace banana."
- icon_state = "banana_peel_blue"
+ icon_state = "bluenana_peel"
// Other
/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 54bd0ec78ec679861ee1917d9b24369dbc09c22d..f56dc1f729a963d83f041e01ac38937a897e9672 100644
GIT binary patch
literal 59934
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