From 0ced9489227e08632ed75031d6ff5bd418c08224 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Tue, 30 Jul 2024 22:57:15 +1200
Subject: [PATCH 01/28] actually fixes Volkan's shoulder companions space
 issue!! for real this time

---
 .../story_content/volkan_equipment/code/volkanpets.dm        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/volkanpets.dm b/maplestation_modules/story_content/volkan_equipment/code/volkanpets.dm
index 513c19a78429..c86f63e930ca 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/volkanpets.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/volkanpets.dm
@@ -28,10 +28,13 @@
 	mob_size = MOB_SIZE_SMALL
 	can_be_held = TRUE
 	held_w_class = WEIGHT_CLASS_SMALL
+
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, STAMINA = 0, OXY = 0)
+	minimum_survivable_temperature = 0
+	unsuitable_atmos_damage = 0 //temperature robust
 
-	melee_damage_upper = 5
+	melee_damage_upper = 5 //It is weak sauce.
 	melee_damage_lower = 1
 
 	response_help_continuous = "pets"

From 50feca9db7425dbe5d982b55305b3caf753b1666 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:16:42 +1200
Subject: [PATCH 02/28] Sunscreen has been invented again, but it does
 nothing... YET

---
 maplestation.dme                              |  1 +
 .../volkan_equipment/code/sunitems.dm         | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

diff --git a/maplestation.dme b/maplestation.dme
index 1c9322709cb1..a07ecc2d9884 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -6529,6 +6529,7 @@
 #include "maplestation_modules\story_content\shiro_equipment\code\shiroclothing.dm"
 #include "maplestation_modules\story_content\story_posters\code\contraband.dm"
 #include "maplestation_modules\story_content\stranger_equipment\code\strangerclothing.dm"
+#include "maplestation_modules\story_content\volkan_equipment\code\sunitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets_ai.dm"
diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
new file mode 100644
index 000000000000..066f5274aaac
--- /dev/null
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -0,0 +1,45 @@
+/*
+ * # Stuff for the beach!
+ * Volkan has 0 pigment, so the sun damages him a lot IC.
+ * His synth duplicate also has this flaw, mainly due to the type of synthflesh used.
+ * He made it too damn realistic.
+ */
+
+//sunscreen, does nothing for now but is cool for flavor.
+/obj/item/sunscreen
+	name = "generic sunscreen"
+	desc = "A generic nanotrasen sunscreen product. Cream based application. It is labeled SPF 30"
+	w_class = WEIGHT_CLASS_TINY
+	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
+	icon_state = "dyespray" //TODO: replace
+	//sunscreen reaplication time in minutes
+	var/reaplication_time = 30
+	var/spf = 30
+
+/obj/item/sunscreen/volkan
+	name = "strange sunscreen"
+	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating"
+	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
+	icon_state = "dyespray" //TODO: replace
+	spf = 50
+
+/obj/item/sunscreen/attack_self(mob/user)
+	apply(user, user)
+
+/obj/item/sunscreen/pre_attack(atom/target, mob/living/user, params)
+	apply(target, user)
+	return ..()
+
+/**
+ * Applies sunscreen to a mob.
+ *
+ * Arguments:
+ * * target - The mob who we will apply the sunscreen to.
+ */
+/obj/item/sunscreen/proc/apply(mob/target, mob/user)
+	if(!ishuman(target))
+		return
+	var/mob/living/carbon/human/human_target = target
+	to_chat(user, span_notice("You start applying the sunscreen..."))
+	if(!do_after(user, 10 SECONDS, target))
+		return

From 997f57df202f1caf439f70a59f69ba0ef32acf3f Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:27:58 +1200
Subject: [PATCH 03/28] more than one brand of sunscreen

---
 .../volkan_equipment/code/sunitems.dm         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 066f5274aaac..595de5b2a3e9 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -1,24 +1,32 @@
 /*
  * # Stuff for the beach!
  * Volkan has 0 pigment, so the sun damages him a lot IC.
- * His synth duplicate also has this flaw, mainly due to the type of synthflesh used.
- * He made it too damn realistic.
+ * His synth avatar also has this flaw, mainly due to the type of synthflesh used. He made it too damn realistic.
+ * As a result, have items that help with dealing with the sun!
  */
 
-//sunscreen, does nothing for now but is cool for flavor.
+///sunscreen, does nothing for now but is cool for flavor.
 /obj/item/sunscreen
 	name = "generic sunscreen"
-	desc = "A generic nanotrasen sunscreen product. Cream based application. It is labeled SPF 30"
+	desc = "A generic sunscreen product. Cream based application. It is labeled SPF 30"
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
 	icon_state = "dyespray" //TODO: replace
-	//sunscreen reaplication time in minutes
+	///How long it takes before sunscreen runs out in minutes
 	var/reaplication_time = 30
+	///The sunscreen's SPF rating.
 	var/spf = 30
 
+/obj/item/sunscreen/nanotrasen
+	name = "Nanotrasen sunscreen"
+	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF 50"
+	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
+	icon_state = "dyespray" //TODO: replace
+	spf = 50
+
 /obj/item/sunscreen/volkan
 	name = "strange sunscreen"
-	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating"
+	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating."
 	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
 	icon_state = "dyespray" //TODO: replace
 	spf = 50
@@ -41,5 +49,3 @@
 		return
 	var/mob/living/carbon/human/human_target = target
 	to_chat(user, span_notice("You start applying the sunscreen..."))
-	if(!do_after(user, 10 SECONDS, target))
-		return

From dc6a5567b573faa0830b169e599823d9bf6d720c Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:27:40 +1200
Subject: [PATCH 04/28] sunscreen with... functionality!!! It lowers burns a
 teeny bit when applied.

---
 .../volkan_equipment/code/sunitems.dm         | 53 ++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 595de5b2a3e9..af3315521c31 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -16,25 +16,39 @@
 	var/reaplication_time = 30
 	///The sunscreen's SPF rating.
 	var/spf = 30
+	///how long it takes to apply in seconds
+	var/application_time = 10
+
+/obj/item/sunscreen/shitty
+	name = "cheap generic sunscreen"
+	desc = "A budget generic sunscreen product. Cream based application. It is labeled SPF 20. It feels like it won't last long."
+	reaplication_time = 1
+
+	spf = 20
 
 /obj/item/sunscreen/nanotrasen
 	name = "Nanotrasen sunscreen"
 	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF 50"
 	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
 	icon_state = "dyespray" //TODO: replace
+
 	spf = 50
+	application_time = 5
 
+///HaSE has developed a pretty good sunscreen. It doesn't smell too great though.
 /obj/item/sunscreen/volkan
 	name = "strange sunscreen"
-	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating."
+	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
 	icon_state = "dyespray" //TODO: replace
-	spf = 50
+
+	spf = 55
+	application_time = 2
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)
 
-/obj/item/sunscreen/pre_attack(atom/target, mob/living/user, params)
+/obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
 	apply(target, user)
 	return ..()
 
@@ -43,9 +57,36 @@
  *
  * Arguments:
  * * target - The mob who we will apply the sunscreen to.
+ * * user -  the mob that is applying the sunscreen.
  */
-/obj/item/sunscreen/proc/apply(mob/target, mob/user)
+/obj/item/sunscreen/proc/apply(mob/living/carbon/target, mob/user)
 	if(!ishuman(target))
 		return
-	var/mob/living/carbon/human/human_target = target
-	to_chat(user, span_notice("You start applying the sunscreen..."))
+
+	if(target == user)
+		user.visible_message(
+			span_notice("[user] starts to apply [src] on [user.p_them()]self..."),
+			span_notice("You begin applying [src] on yourself...")
+		)
+	else
+		user.visible_message(
+			span_notice("[user] starts to apply [src] on [target]."),
+			span_notice("You begin applying [src] on [target]...")
+		)
+	var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
+
+	affecting.burn_modifier -= spf/1000
+
+	if(do_after(user, application_time SECONDS, user))
+		addtimer(CALLBACK(src, PROC_REF(loseEffectiveness), target, affecting), reaplication_time MINUTES)
+		user.visible_message(
+			span_notice("[user] has applied [src] onto [target]."),
+			to_chat(target, span_notice("You have applied [src]!"))
+		)
+
+
+///Stuff that happens when the sunscreen runs out.
+/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, var/obj/item/bodypart/affecting)
+	affecting.burn_modifier += spf/1000
+	to_chat(target, span_notice("You don't feel the sunscreen anymore."))
+

From d5392562a0af8102ebecc6b99f366c4402866b3b Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:58:01 +1200
Subject: [PATCH 05/28] sunscreen sprites!!

---
 .../volkan_equipment/code/sunitems.dm             |  11 ++++-------
 .../volkan_equipment/icons/sun_items.dmi          | Bin 0 -> 960 bytes
 2 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index af3315521c31..991f6c0142f0 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -10,8 +10,8 @@
 	name = "generic sunscreen"
 	desc = "A generic sunscreen product. Cream based application. It is labeled SPF 30"
 	w_class = WEIGHT_CLASS_TINY
-	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
-	icon_state = "dyespray" //TODO: replace
+	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
+	icon_state = "sunscreen_generic"
 	///How long it takes before sunscreen runs out in minutes
 	var/reaplication_time = 30
 	///The sunscreen's SPF rating.
@@ -29,8 +29,7 @@
 /obj/item/sunscreen/nanotrasen
 	name = "Nanotrasen sunscreen"
 	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF 50"
-	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
-	icon_state = "dyespray" //TODO: replace
+	icon_state = "sunscreen_nanotrasen"
 
 	spf = 50
 	application_time = 5
@@ -39,8 +38,7 @@
 /obj/item/sunscreen/volkan
 	name = "strange sunscreen"
 	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
-	icon = 'icons/obj/cosmetic.dmi' //TODO: replace
-	icon_state = "dyespray" //TODO: replace
+	icon_state = "sunscreen_volkan"
 
 	spf = 55
 	application_time = 2
@@ -84,7 +82,6 @@
 			to_chat(target, span_notice("You have applied [src]!"))
 		)
 
-
 ///Stuff that happens when the sunscreen runs out.
 /obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, var/obj/item/bodypart/affecting)
 	affecting.burn_modifier += spf/1000
diff --git a/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi b/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..fc0a79e6435ca6454c50363a3b75f5e8d00eefa8
GIT binary patch
literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0001sdQ@0+L}hbh
za%pgMX>V=-0C)kFk2?;+Knw-z-BVaekNCATC=p6Qu7Iq>WG%oe*(O|{6=|WMo6*x0
zuZClL>UwC-U7Sgcv%mrNt91-79z7M=ZDUBpQ}RX3(Wzi%Pq9IX<T8<v@=(PvvRc_T
zF<ccNwD6ZgP_io;$sf_2?>GDz)X?_L=g1q35I=`iBNLwh00QtyL_t(|+U?q3XcBQ8
z0PwF+L&jP(%CWJrU@{FBV=QF|1-=PF64X;oSoqLGxPhR-9$F8B6ogHB2$Td@PX%Eh
zNF#(I8QK^lAsr3^hvEt&8zL55{4VbB+&#F1`z^ii_vP;UJ>=)_bH6|L@Kb@pLxlhc
zfB*=900@8p2+(fWY&J%t(HyA<gFz~olUJ<F*>gwR|F{vB)V`!25d^(n&)#RVS-~?>
z_j<juVl*TC{Ba<7Hga(i;;-6oU-BRIcsvXT5RFDv%{a}uTw%HSul@b68OVH!shV+`
zb1EZ%Mu%HR0D0450J2Yk(w7t~fA7Hxn?HTL#9oIk8L1$oawWF?ySE)|{_I7Fy&82x
z@~;8$$SPyLVTZ%-MM1sq{4gY5N5EoVloet1d7QD^%uuWx3hKiHeGrKzVDXOS*zF%1
zV9H>Eff22sUfIvXPC7{iz+{*L?eKu0o-bA)nckrX(4+1Z)Eo606#(7UC1yQzA9~e2
zf_kmqfH}t#$bDFm7a+fzV@8KAh)#h*=^JP#bg}|et5wEyD-5T4&Isy%8o%Io?SLMD
zSkMIc9Cxz$^z|@oznO>2mH=IViOFf$&1?&<?>64b4nU^B>0S*Bz;&Jk0Z6`_hyMP4
zdLy6}fyM}E1t7tV04f0g!!8h7&xx)9jyYZT?*iO5D7FhIVjDbhfWX5AX4WtRqvLuW
zfposGmxayr7C0ZR$qKNr9AIXQv!EXz<q=5dvwH>DN^Qd0vQu6F4neFgcjucC#OhKy
zFA1RA0s#;J0T2KI5C8!X009sH0T2KI5C8!X009u7%^-&)xO>_MBu*TFbbfGfkk8BI
za>pV_1{fO~<MVpG-mwUh0jyRlpT}Y`<&6L`1=MPFN56f^0Qp>w@%jBcfZOE)txl&b
zfNN$mdqj>LmwTT`C<}m0fpj{}=LUm8d24{*=L0ed$lG_h-M9!MfRX?>1nypOpTgY~
i2!H?xfB*=f<oFA%#Gz1bV_Rkb0000<MNUMnLSTX+(xvkN

literal 0
HcmV?d00001


From 40ef067edd5ed4858908750772b11509a178d902 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:00:31 +1200
Subject: [PATCH 06/28] minor balance edit

---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 991f6c0142f0..c2c0c029e82c 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -40,7 +40,7 @@
 	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon_state = "sunscreen_volkan"
 
-	spf = 55
+	spf = 50
 	application_time = 2
 
 /obj/item/sunscreen/attack_self(mob/user)

From 413b7d4cf02832476ec28a03f9076826790d3312 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:03:37 +1200
Subject: [PATCH 07/28] more balance

---
 .../story_content/volkan_equipment/code/sunitems.dm            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index c2c0c029e82c..6f1f6e570acb 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -41,7 +41,8 @@
 	icon_state = "sunscreen_volkan"
 
 	spf = 50
-	application_time = 2
+	application_time = 1
+	reaplication_time = 15 //spray based doesn't last as long, plus its funny to have volkan be applying sunscreen all the time.
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)

From af5c8011919cb8a0f0f8fb46635e203d7423d913 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:07:18 +1200
Subject: [PATCH 08/28] woopsies! fix that!

---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 6f1f6e570acb..1b0ec1c13a07 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -84,7 +84,7 @@
 		)
 
 ///Stuff that happens when the sunscreen runs out.
-/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, var/obj/item/bodypart/affecting)
+/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, /obj/item/bodypart/affecting)
 	affecting.burn_modifier += spf/1000
 	to_chat(target, span_notice("You don't feel the sunscreen anymore."))
 

From 885807770122e2d3dd6a8d98cc8e54379bc6036c Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:11:15 +1200
Subject: [PATCH 09/28] OK maybe Volkan's AIs would make the SPF very good. I
 will think of a funny drawback due to this insane SPF later.

---
 .../story_content/volkan_equipment/code/sunitems.dm           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 1b0ec1c13a07..a3bb7bb35126 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -40,9 +40,9 @@
 	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon_state = "sunscreen_volkan"
 
-	spf = 50
+	spf = 60
 	application_time = 1
-	reaplication_time = 15 //spray based doesn't last as long, plus its funny to have volkan be applying sunscreen all the time.
+	reaplication_time = 15 //spray based doesn't last as long, plus it's funny to have volkan be applying sunscreen all the time.
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)

From 5b5febfc00806626b42b6c482b2d394cfd31bdfe Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:13:03 +1200
Subject: [PATCH 10/28] aaaaa

---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index a3bb7bb35126..4f804906660e 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -40,7 +40,7 @@
 	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon_state = "sunscreen_volkan"
 
-	spf = 60
+	spf = 100
 	application_time = 1
 	reaplication_time = 15 //spray based doesn't last as long, plus it's funny to have volkan be applying sunscreen all the time.
 

From 3ad316a15a7ff84da2700f2113178bf17c34d237 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:19:18 +1200
Subject: [PATCH 11/28] variables be annoying sometimes. compiles!!

---
 .../story_content/volkan_equipment/code/sunitems.dm          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 4f804906660e..b3778626fc79 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -77,14 +77,15 @@
 	affecting.burn_modifier -= spf/1000
 
 	if(do_after(user, application_time SECONDS, user))
-		addtimer(CALLBACK(src, PROC_REF(loseEffectiveness), target, affecting), reaplication_time MINUTES)
+		addtimer(CALLBACK(src, PROC_REF(loseEffectiveness), target, user), reaplication_time MINUTES)
 		user.visible_message(
 			span_notice("[user] has applied [src] onto [target]."),
 			to_chat(target, span_notice("You have applied [src]!"))
 		)
 
 ///Stuff that happens when the sunscreen runs out.
-/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, /obj/item/bodypart/affecting)
+/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, mob/user)
+	var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
 	affecting.burn_modifier += spf/1000
 	to_chat(target, span_notice("You don't feel the sunscreen anymore."))
 

From 415aa313088cbdb76bd8367652572cde598255f1 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Fri, 30 Aug 2024 23:52:05 +1200
Subject: [PATCH 12/28] Volkan umbrella inventory sprites

---
 .../volkan_equipment/icons/sun_items.dmi       | Bin 960 -> 1861 bytes
 .../icons/umbrella_inhand_lh.dmi               | Bin 0 -> 930 bytes
 .../icons/umbrella_inhand_rh.dmi               | Bin 0 -> 930 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi
 create mode 100644 maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi

diff --git a/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi b/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi
index fc0a79e6435ca6454c50363a3b75f5e8d00eefa8..0a30b411cb1314c05aa175b41711df79278af7d6 100644
GIT binary patch
literal 1861
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

literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0001sdQ@0+L}hbh
za%pgMX>V=-0C)kFk2?;+Knw-z-BVaekNCATC=p6Qu7Iq>WG%oe*(O|{6=|WMo6*x0
zuZClL>UwC-U7Sgcv%mrNt91-79z7M=ZDUBpQ}RX3(Wzi%Pq9IX<T8<v@=(PvvRc_T
zF<ccNwD6ZgP_io;$sf_2?>GDz)X?_L=g1q35I=`iBNLwh00QtyL_t(|+U?q3XcBQ8
z0PwF+L&jP(%CWJrU@{FBV=QF|1-=PF64X;oSoqLGxPhR-9$F8B6ogHB2$Td@PX%Eh
zNF#(I8QK^lAsr3^hvEt&8zL55{4VbB+&#F1`z^ii_vP;UJ>=)_bH6|L@Kb@pLxlhc
zfB*=900@8p2+(fWY&J%t(HyA<gFz~olUJ<F*>gwR|F{vB)V`!25d^(n&)#RVS-~?>
z_j<juVl*TC{Ba<7Hga(i;;-6oU-BRIcsvXT5RFDv%{a}uTw%HSul@b68OVH!shV+`
zb1EZ%Mu%HR0D0450J2Yk(w7t~fA7Hxn?HTL#9oIk8L1$oawWF?ySE)|{_I7Fy&82x
z@~;8$$SPyLVTZ%-MM1sq{4gY5N5EoVloet1d7QD^%uuWx3hKiHeGrKzVDXOS*zF%1
zV9H>Eff22sUfIvXPC7{iz+{*L?eKu0o-bA)nckrX(4+1Z)Eo606#(7UC1yQzA9~e2
zf_kmqfH}t#$bDFm7a+fzV@8KAh)#h*=^JP#bg}|et5wEyD-5T4&Isy%8o%Io?SLMD
zSkMIc9Cxz$^z|@oznO>2mH=IViOFf$&1?&<?>64b4nU^B>0S*Bz;&Jk0Z6`_hyMP4
zdLy6}fyM}E1t7tV04f0g!!8h7&xx)9jyYZT?*iO5D7FhIVjDbhfWX5AX4WtRqvLuW
zfposGmxayr7C0ZR$qKNr9AIXQv!EXz<q=5dvwH>DN^Qd0vQu6F4neFgcjucC#OhKy
zFA1RA0s#;J0T2KI5C8!X009sH0T2KI5C8!X009u7%^-&)xO>_MBu*TFbbfGfkk8BI
za>pV_1{fO~<MVpG-mwUh0jyRlpT}Y`<&6L`1=MPFN56f^0Qp>w@%jBcfZOE)txl&b
zfNN$mdqj>LmwTT`C<}m0fpj{}=LUm8d24{*=L0ed$lG_h-M9!MfRX?>1nypOpTgY~
i2!H?xfB*=f<oFA%#Gz1bV_Rkb0000<MNUMnLSTX+(xvkN

diff --git a/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi b/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b54f90c7da7ce7f6e97e769e7f6cd52ce25965ef
GIT binary patch
literal 930
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9>F
zsy(Oq91H{)&fi^sqd<K9>TZF;2jWXSr<*x0js3Ilk(qIO=f=F<bw|=(JXCt#dw1g@
zBTvUWZX5Z6o+y~ibp5P9Pc`_!iR|iiU3W?Z+!dx2+C33E^5%(~e!4)iwb}i@j2gRS
zWxCHBtYlzddgbZj7*cWT?X3OXQH}z~pNop`aAwuDsTUE`Qi{r0-Xy>qadYXGfbNbL
z_6d_kJQx0NPzW>AWEKl^Qi)hGSFEd7%<Pn=Mus9w%I3{G)ql21%x@|;zkKH1V?*oD
zH*bdi(K^U&-pL@qz~sQd!N91%z|sKc{Mddq%XHe=w4*yBbev42YRw+-i9P!Md*<!8
zVvno#>eZ+S3GTc9-g)=keOdx{^QK$M@JaBnCA}-!`QY6<KPyRwSx1u+)h2Tau!!}V
z&Gkz(ni&%-9>dZQw?3VJuH}+X?^znIJvY1a`-{Q+^XvH>mIfu3?UohmW__m4z{1qn
zrsA0|QhMO+TV0lBN5+J$Q3uO*@4dx$A#3Xduca&vSzEh)YBM){XAtXcy!hnf*17d2
z$8Lo0Gkmz2X+nRa-*Vx{Pm3z2zWvYfpmzQB-!pvFp7v#QC{1Om&}w7YQJuT_<{=CD
zUN`pg`3yGZ49g`@J&qCz5KcofPpHJZeG3I9o=iEi`C|o7)>f%j5yS9BatoDO<wWP5
zO=AvQ9a?y1GUI|568*>RKit1zfAai}H!4CV5<CK2tu7Z=D4q5!mgo|G>S`>hrgceT
z`s+!T41cN#alX`H=sLPc<IA&WY_7-u{(f3CvvP0Tjkje2-A9k;*?yTLQ1Ls~<7Ka#
zvmlF(oebaqkR|)~G*zDuD7kKE_;k+Zn`=sp82XPNep0wHMCji0&u{O)FR@y4HOp~f
zfIu-z1LvYCaveWK%NzIn-Xx=c+}>^akvo@OeyKaxzp^BVJwbcn{Ih8jPCu=)W{NRN
zml0xP{}arl*L2>%(}ruth9CwB?r8bsl_6RNv(K`3Pt=`%-gxmvj(WM<|Ct)5%f##S
zbT4LYKDfWcY|je0^3?efYJLA=$`7pHxIw$0@j{N7Yuul|r&k?*{dHERiBzVAjM4JT
ol^^@Bc&~B3&y1Sd4sdUkcb=IU@L-YKEe0U)boFyt=akR{06Ou8%K!iX

literal 0
HcmV?d00001

diff --git a/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi b/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b54f90c7da7ce7f6e97e769e7f6cd52ce25965ef
GIT binary patch
literal 930
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9>F
zsy(Oq91H{)&fi^sqd<K9>TZF;2jWXSr<*x0js3Ilk(qIO=f=F<bw|=(JXCt#dw1g@
zBTvUWZX5Z6o+y~ibp5P9Pc`_!iR|iiU3W?Z+!dx2+C33E^5%(~e!4)iwb}i@j2gRS
zWxCHBtYlzddgbZj7*cWT?X3OXQH}z~pNop`aAwuDsTUE`Qi{r0-Xy>qadYXGfbNbL
z_6d_kJQx0NPzW>AWEKl^Qi)hGSFEd7%<Pn=Mus9w%I3{G)ql21%x@|;zkKH1V?*oD
zH*bdi(K^U&-pL@qz~sQd!N91%z|sKc{Mddq%XHe=w4*yBbev42YRw+-i9P!Md*<!8
zVvno#>eZ+S3GTc9-g)=keOdx{^QK$M@JaBnCA}-!`QY6<KPyRwSx1u+)h2Tau!!}V
z&Gkz(ni&%-9>dZQw?3VJuH}+X?^znIJvY1a`-{Q+^XvH>mIfu3?UohmW__m4z{1qn
zrsA0|QhMO+TV0lBN5+J$Q3uO*@4dx$A#3Xduca&vSzEh)YBM){XAtXcy!hnf*17d2
z$8Lo0Gkmz2X+nRa-*Vx{Pm3z2zWvYfpmzQB-!pvFp7v#QC{1Om&}w7YQJuT_<{=CD
zUN`pg`3yGZ49g`@J&qCz5KcofPpHJZeG3I9o=iEi`C|o7)>f%j5yS9BatoDO<wWP5
zO=AvQ9a?y1GUI|568*>RKit1zfAai}H!4CV5<CK2tu7Z=D4q5!mgo|G>S`>hrgceT
z`s+!T41cN#alX`H=sLPc<IA&WY_7-u{(f3CvvP0Tjkje2-A9k;*?yTLQ1Ls~<7Ka#
zvmlF(oebaqkR|)~G*zDuD7kKE_;k+Zn`=sp82XPNep0wHMCji0&u{O)FR@y4HOp~f
zfIu-z1LvYCaveWK%NzIn-Xx=c+}>^akvo@OeyKaxzp^BVJwbcn{Ih8jPCu=)W{NRN
zml0xP{}arl*L2>%(}ruth9CwB?r8bsl_6RNv(K`3Pt=`%-gxmvj(WM<|Ct)5%f##S
zbT4LYKDfWcY|je0^3?efYJLA=$`7pHxIw$0@j{N7Yuul|r&k?*{dHERiBzVAjM4JT
ol^^@Bc&~B3&y1Sd4sdUkcb=IU@L-YKEe0U)boFyt=akR{06Ou8%K!iX

literal 0
HcmV?d00001


From b4df485c574e1203d6227f6a0e72049f7afd98e6 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 00:33:51 +1200
Subject: [PATCH 13/28] fixes up the sunscreen

---
 .../volkan_equipment/code/sunitems.dm         |  75 ++++++++++++------
 .../volkan_equipment/icons/sun_items.dmi      | Bin 1861 -> 1861 bytes
 2 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index b3778626fc79..cd72e2a35fd2 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -5,34 +5,35 @@
  * As a result, have items that help with dealing with the sun!
  */
 
-///sunscreen, does nothing for now but is cool for flavor.
+///Sunscreen!
 /obj/item/sunscreen
 	name = "generic sunscreen"
 	desc = "A generic sunscreen product. Cream based application. It is labeled SPF 30"
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
 	icon_state = "sunscreen_generic"
-	///How long it takes before sunscreen runs out in minutes
-	var/reaplication_time = 30
-	///The sunscreen's SPF rating.
-	var/spf = 30
+
 	///how long it takes to apply in seconds
-	var/application_time = 10
+	var/application_time = 10 SECONDS
+	///How long it takes before sunscreen runs out in minutes
+	var/reaplication_time = 1800 SECONDS
+	///The sunscreen's burn modifier.
+	var/burn_modifier = 0.03
 
 /obj/item/sunscreen/shitty
 	name = "cheap generic sunscreen"
 	desc = "A budget generic sunscreen product. Cream based application. It is labeled SPF 20. It feels like it won't last long."
-	reaplication_time = 1
 
-	spf = 20
+	reaplication_time = 60 SECONDS
+	burn_modifier = 0.02
 
 /obj/item/sunscreen/nanotrasen
 	name = "Nanotrasen sunscreen"
 	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF 50"
 	icon_state = "sunscreen_nanotrasen"
 
-	spf = 50
-	application_time = 5
+	application_time = 5 SECONDS
+	burn_modifier = 0.05
 
 ///HaSE has developed a pretty good sunscreen. It doesn't smell too great though.
 /obj/item/sunscreen/volkan
@@ -40,9 +41,9 @@
 	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon_state = "sunscreen_volkan"
 
-	spf = 100
-	application_time = 1
-	reaplication_time = 15 //spray based doesn't last as long, plus it's funny to have volkan be applying sunscreen all the time.
+	application_time = 1 SECONDS
+	reaplication_time = 900 SECONDS//spray based doesn't last as long, plus it's funny to have volkan be applying sunscreen all the time.
+	burn_modifier = 0.1
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)
@@ -72,20 +73,44 @@
 			span_notice("[user] starts to apply [src] on [target]."),
 			span_notice("You begin applying [src] on [target]...")
 		)
-	var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
 
-	affecting.burn_modifier -= spf/1000
+	if(do_after(user, application_time, user))
+		target.apply_status_effect(/datum/status_effect/sunscreen, reaplication_time, burn_modifier)
 
-	if(do_after(user, application_time SECONDS, user))
-		addtimer(CALLBACK(src, PROC_REF(loseEffectiveness), target, user), reaplication_time MINUTES)
-		user.visible_message(
-			span_notice("[user] has applied [src] onto [target]."),
-			to_chat(target, span_notice("You have applied [src]!"))
-		)
+
+//sunscreen status effect
+/atom/movable/screen/alert/status_effect/sunscreen
+	name = "Sunscreen"
+	desc = "You are covered in sunscreen!"
+	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
+	icon_state = "sunscreen_generic"
+
+/datum/status_effect/sunscreen
+	id = "sunscreen"
+	duration = 1800 SECONDS
+	var/burn_modifier = 0.03
+	alert_type = /atom/movable/screen/alert/status_effect/sunscreen
+
+/datum/status_effect/sunscreen/on_creation(mob/living/new_owner, _duration, _burn_modifier)
+	duration = _duration
+	burn_modifier = _burn_modifier
+	return ..()
+
+/datum/status_effect/sunscreen/on_apply()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		H.physiology.burn_mod -= burn_modifier
+	owner.visible_message(span_warning("[owner] has applied sunscreen!"),
+		span_notice("You are covered in sunscreen!"))
+	return ..()
 
 ///Stuff that happens when the sunscreen runs out.
-/obj/item/sunscreen/proc/loseEffectiveness(mob/living/carbon/target, mob/user)
-	var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
-	affecting.burn_modifier += spf/1000
-	to_chat(target, span_notice("You don't feel the sunscreen anymore."))
+/datum/status_effect/sunscreen/on_remove()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		H.physiology.burn_mod += burn_modifier
+	owner.visible_message(span_warning("[owner]'s sunscreen dissolves away."),
+		span_notice("Your sunscreen is gone!"))
+
 
+///Umbrella!
diff --git a/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi b/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi
index 0a30b411cb1314c05aa175b41711df79278af7d6..36a808b34ebc900a7a4d20648c747dce4a7da2b1 100644
GIT binary patch
delta 1624
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
W5jTCt3@;o20000<MNUMnLSTZKo9kr&

delta 1624
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
Wm^6J(nS%%b0000<MNUMnLSTY|0|A`?


From 6301051f2c74c048da9019445c408cdbc87da106 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 00:38:40 +1200
Subject: [PATCH 14/28] we dont need the umbreallas here, umbrella will be
 separate PR!

---
 .../volkan_equipment/icons/umbrella_inhand_lh.dmi | Bin 930 -> 0 bytes
 .../volkan_equipment/icons/umbrella_inhand_rh.dmi | Bin 930 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi
 delete mode 100644 maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi

diff --git a/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi b/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_lh.dmi
deleted file mode 100644
index b54f90c7da7ce7f6e97e769e7f6cd52ce25965ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9>F
zsy(Oq91H{)&fi^sqd<K9>TZF;2jWXSr<*x0js3Ilk(qIO=f=F<bw|=(JXCt#dw1g@
zBTvUWZX5Z6o+y~ibp5P9Pc`_!iR|iiU3W?Z+!dx2+C33E^5%(~e!4)iwb}i@j2gRS
zWxCHBtYlzddgbZj7*cWT?X3OXQH}z~pNop`aAwuDsTUE`Qi{r0-Xy>qadYXGfbNbL
z_6d_kJQx0NPzW>AWEKl^Qi)hGSFEd7%<Pn=Mus9w%I3{G)ql21%x@|;zkKH1V?*oD
zH*bdi(K^U&-pL@qz~sQd!N91%z|sKc{Mddq%XHe=w4*yBbev42YRw+-i9P!Md*<!8
zVvno#>eZ+S3GTc9-g)=keOdx{^QK$M@JaBnCA}-!`QY6<KPyRwSx1u+)h2Tau!!}V
z&Gkz(ni&%-9>dZQw?3VJuH}+X?^znIJvY1a`-{Q+^XvH>mIfu3?UohmW__m4z{1qn
zrsA0|QhMO+TV0lBN5+J$Q3uO*@4dx$A#3Xduca&vSzEh)YBM){XAtXcy!hnf*17d2
z$8Lo0Gkmz2X+nRa-*Vx{Pm3z2zWvYfpmzQB-!pvFp7v#QC{1Om&}w7YQJuT_<{=CD
zUN`pg`3yGZ49g`@J&qCz5KcofPpHJZeG3I9o=iEi`C|o7)>f%j5yS9BatoDO<wWP5
zO=AvQ9a?y1GUI|568*>RKit1zfAai}H!4CV5<CK2tu7Z=D4q5!mgo|G>S`>hrgceT
z`s+!T41cN#alX`H=sLPc<IA&WY_7-u{(f3CvvP0Tjkje2-A9k;*?yTLQ1Ls~<7Ka#
zvmlF(oebaqkR|)~G*zDuD7kKE_;k+Zn`=sp82XPNep0wHMCji0&u{O)FR@y4HOp~f
zfIu-z1LvYCaveWK%NzIn-Xx=c+}>^akvo@OeyKaxzp^BVJwbcn{Ih8jPCu=)W{NRN
zml0xP{}arl*L2>%(}ruth9CwB?r8bsl_6RNv(K`3Pt=`%-gxmvj(WM<|Ct)5%f##S
zbT4LYKDfWcY|je0^3?efYJLA=$`7pHxIw$0@j{N7Yuul|r&k?*{dHERiBzVAjM4JT
ol^^@Bc&~B3&y1Sd4sdUkcb=IU@L-YKEe0U)boFyt=akR{06Ou8%K!iX

diff --git a/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi b/maplestation_modules/story_content/volkan_equipment/icons/umbrella_inhand_rh.dmi
deleted file mode 100644
index b54f90c7da7ce7f6e97e769e7f6cd52ce25965ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9>F
zsy(Oq91H{)&fi^sqd<K9>TZF;2jWXSr<*x0js3Ilk(qIO=f=F<bw|=(JXCt#dw1g@
zBTvUWZX5Z6o+y~ibp5P9Pc`_!iR|iiU3W?Z+!dx2+C33E^5%(~e!4)iwb}i@j2gRS
zWxCHBtYlzddgbZj7*cWT?X3OXQH}z~pNop`aAwuDsTUE`Qi{r0-Xy>qadYXGfbNbL
z_6d_kJQx0NPzW>AWEKl^Qi)hGSFEd7%<Pn=Mus9w%I3{G)ql21%x@|;zkKH1V?*oD
zH*bdi(K^U&-pL@qz~sQd!N91%z|sKc{Mddq%XHe=w4*yBbev42YRw+-i9P!Md*<!8
zVvno#>eZ+S3GTc9-g)=keOdx{^QK$M@JaBnCA}-!`QY6<KPyRwSx1u+)h2Tau!!}V
z&Gkz(ni&%-9>dZQw?3VJuH}+X?^znIJvY1a`-{Q+^XvH>mIfu3?UohmW__m4z{1qn
zrsA0|QhMO+TV0lBN5+J$Q3uO*@4dx$A#3Xduca&vSzEh)YBM){XAtXcy!hnf*17d2
z$8Lo0Gkmz2X+nRa-*Vx{Pm3z2zWvYfpmzQB-!pvFp7v#QC{1Om&}w7YQJuT_<{=CD
zUN`pg`3yGZ49g`@J&qCz5KcofPpHJZeG3I9o=iEi`C|o7)>f%j5yS9BatoDO<wWP5
zO=AvQ9a?y1GUI|568*>RKit1zfAai}H!4CV5<CK2tu7Z=D4q5!mgo|G>S`>hrgceT
z`s+!T41cN#alX`H=sLPc<IA&WY_7-u{(f3CvvP0Tjkje2-A9k;*?yTLQ1Ls~<7Ka#
zvmlF(oebaqkR|)~G*zDuD7kKE_;k+Zn`=sp82XPNep0wHMCji0&u{O)FR@y4HOp~f
zfIu-z1LvYCaveWK%NzIn-Xx=c+}>^akvo@OeyKaxzp^BVJwbcn{Ih8jPCu=)W{NRN
zml0xP{}arl*L2>%(}ruth9CwB?r8bsl_6RNv(K`3Pt=`%-gxmvj(WM<|Ct)5%f##S
zbT4LYKDfWcY|je0^3?efYJLA=$`7pHxIw$0@j{N7Yuul|r&k?*{dHERiBzVAjM4JT
ol^^@Bc&~B3&y1Sd4sdUkcb=IU@L-YKEe0U)boFyt=akR{06Ou8%K!iX


From 8139f5ad74d4fe0ccbc0ef1b790c28dbc1c058fa Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 00:42:20 +1200
Subject: [PATCH 15/28] sunscreen descriptions

---
 .../story_content/volkan_equipment/code/sunitems.dm    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index cd72e2a35fd2..2b20cee8a224 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -8,7 +8,7 @@
 ///Sunscreen!
 /obj/item/sunscreen
 	name = "generic sunscreen"
-	desc = "A generic sunscreen product. Cream based application. It is labeled SPF 30"
+	desc = "A generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]."
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
 	icon_state = "sunscreen_generic"
@@ -22,14 +22,14 @@
 
 /obj/item/sunscreen/shitty
 	name = "cheap generic sunscreen"
-	desc = "A budget generic sunscreen product. Cream based application. It is labeled SPF 20. It feels like it won't last long."
+	desc = "A budget generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. It feels like it won't last long. Reapply in [reaplication_time / 60] minutes."
 
 	reaplication_time = 60 SECONDS
 	burn_modifier = 0.02
 
 /obj/item/sunscreen/nanotrasen
 	name = "Nanotrasen sunscreen"
-	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF 50"
+	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes."
 	icon_state = "sunscreen_nanotrasen"
 
 	application_time = 5 SECONDS
@@ -38,7 +38,7 @@
 ///HaSE has developed a pretty good sunscreen. It doesn't smell too great though.
 /obj/item/sunscreen/volkan
 	name = "strange sunscreen"
-	desc = "A sunscreen product in a metal container. It seems to have a high SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
+	desc = "A sunscreen product in a metal container. It seems to have a [burn_modifier * 1000] SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed. Reapply in [reaplication_time / 60] minutes."
 	icon_state = "sunscreen_volkan"
 
 	application_time = 1 SECONDS
@@ -50,7 +50,7 @@
 
 /obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
 	apply(target, user)
-	return ..()
+	return ITEM_INTERACT_SUCCESS
 
 /**
  * Applies sunscreen to a mob.

From 924962be452854ec5ddcaa9087bf1cf253ce5da1 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 00:43:05 +1200
Subject: [PATCH 16/28] more description stuff

---
 .../story_content/volkan_equipment/code/sunitems.dm          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 2b20cee8a224..4e4b868fb896 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -8,7 +8,7 @@
 ///Sunscreen!
 /obj/item/sunscreen
 	name = "generic sunscreen"
-	desc = "A generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]."
+	desc = "A generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes."
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
 	icon_state = "sunscreen_generic"
@@ -111,6 +111,3 @@
 		H.physiology.burn_mod += burn_modifier
 	owner.visible_message(span_warning("[owner]'s sunscreen dissolves away."),
 		span_notice("Your sunscreen is gone!"))
-
-
-///Umbrella!

From 62eab1509bc1883e8e3cf09f2129f1c4be1d2740 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 01:06:33 +1200
Subject: [PATCH 17/28] A big woopsie doodles fixed!!

---
 .../story_content/volkan_equipment/code/sunitems.dm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 4e4b868fb896..ff17e089ba70 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -8,28 +8,28 @@
 ///Sunscreen!
 /obj/item/sunscreen
 	name = "generic sunscreen"
-	desc = "A generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes."
+	desc = "A generic sunscreen product. Cream based application."
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi'
 	icon_state = "sunscreen_generic"
 
 	///how long it takes to apply in seconds
 	var/application_time = 10 SECONDS
-	///How long it takes before sunscreen runs out in minutes
+	///How long it takes before sunscreen runs out in seconds
 	var/reaplication_time = 1800 SECONDS
 	///The sunscreen's burn modifier.
 	var/burn_modifier = 0.03
 
 /obj/item/sunscreen/shitty
 	name = "cheap generic sunscreen"
-	desc = "A budget generic sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. It feels like it won't last long. Reapply in [reaplication_time / 60] minutes."
+	desc = "A budget generic sunscreen product. Cream based application."
 
 	reaplication_time = 60 SECONDS
 	burn_modifier = 0.02
 
 /obj/item/sunscreen/nanotrasen
 	name = "Nanotrasen sunscreen"
-	desc = "A Nanotrasen sunscreen product. Cream based application. It is labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes."
+	desc = "A Nanotrasen sunscreen product. Cream based application."
 	icon_state = "sunscreen_nanotrasen"
 
 	application_time = 5 SECONDS
@@ -38,7 +38,7 @@
 ///HaSE has developed a pretty good sunscreen. It doesn't smell too great though.
 /obj/item/sunscreen/volkan
 	name = "strange sunscreen"
-	desc = "A sunscreen product in a metal container. It seems to have a [burn_modifier * 1000] SPF rating. It seems to be a spray based application. Smells like industrial chemicals when sprayed. Reapply in [reaplication_time / 60] minutes."
+	desc = "A sunscreen product in a metal container. It seems to be a spray based application. Smells like industrial chemicals when sprayed."
 	icon_state = "sunscreen_volkan"
 
 	application_time = 1 SECONDS
@@ -47,6 +47,9 @@
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)
+/obj/item/sunscreen/examine()
+   . = ..()
+   . += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes.")
 
 /obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
 	apply(target, user)

From 3dc033da03ba47a9d0242bd8baf0c8950e263c5d Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 01:17:14 +1200
Subject: [PATCH 18/28] turns out seconds need to be divided by 600 instead of
 60.

---
 .../story_content/volkan_equipment/code/sunitems.dm            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index ff17e089ba70..6306813aa919 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -47,9 +47,10 @@
 
 /obj/item/sunscreen/attack_self(mob/user)
 	apply(user, user)
+
 /obj/item/sunscreen/examine()
    . = ..()
-   . += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 60] minutes.")
+   . += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 600] minutes.")
 
 /obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
 	apply(target, user)

From 39e3929392bb9af0df2fe383718cbb07bfe5874c Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 02:11:57 +1200
Subject: [PATCH 19/28] what's with the checks aa???

---
 .../story_content/volkan_equipment/code/sunitems.dm              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 6306813aa919..1f41819f4467 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -81,7 +81,6 @@
 	if(do_after(user, application_time, user))
 		target.apply_status_effect(/datum/status_effect/sunscreen, reaplication_time, burn_modifier)
 
-
 //sunscreen status effect
 /atom/movable/screen/alert/status_effect/sunscreen
 	name = "Sunscreen"

From 2ae5a1bc14ba55b0ffc04575df370d2a16dc16aa Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 02:17:41 +1200
Subject: [PATCH 20/28] aaaaa

---
 maplestation.dme                                              | 1 -
 .../story_content/volkan_equipment/code/sunitems.dm           | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/maplestation.dme b/maplestation.dme
index a07ecc2d9884..1c9322709cb1 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -6529,7 +6529,6 @@
 #include "maplestation_modules\story_content\shiro_equipment\code\shiroclothing.dm"
 #include "maplestation_modules\story_content\story_posters\code\contraband.dm"
 #include "maplestation_modules\story_content\stranger_equipment\code\strangerclothing.dm"
-#include "maplestation_modules\story_content\volkan_equipment\code\sunitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets_ai.dm"
diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 1f41819f4467..bdbceff27e99 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -49,8 +49,8 @@
 	apply(user, user)
 
 /obj/item/sunscreen/examine()
-   . = ..()
-   . += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 600] minutes.")
+	. = ..()
+	. += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 600] minutes.")
 
 /obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
 	apply(target, user)

From 3527cffb1305cac177c618e8440a1a77b273ad95 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 15:01:35 +1200
Subject: [PATCH 21/28] actually ticked

---
 maplestation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maplestation.dme b/maplestation.dme
index 1c9322709cb1..a07ecc2d9884 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -6529,6 +6529,7 @@
 #include "maplestation_modules\story_content\shiro_equipment\code\shiroclothing.dm"
 #include "maplestation_modules\story_content\story_posters\code\contraband.dm"
 #include "maplestation_modules\story_content\stranger_equipment\code\strangerclothing.dm"
+#include "maplestation_modules\story_content\volkan_equipment\code\sunitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanitems.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets_ai.dm"

From 9c24f36e08e006b8f45952c029ef892dee60d7b0 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 15:02:49 +1200
Subject: [PATCH 22/28] I moved the umbrellas to another branch, removed the
 two sprites.

---
 .../volkan_equipment/code/volkanitems.dm       |   2 +-
 .../volkan_equipment/icons/sun_items.dmi       | Bin 1861 -> 563 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/volkanitems.dm b/maplestation_modules/story_content/volkan_equipment/code/volkanitems.dm
index e50046a899ca..5620e70e0337 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/volkanitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/volkanitems.dm
@@ -72,7 +72,7 @@
 	/// the typepath of mob mob that it will turn into
 	var/mobtype
 	/// the sound the mob will make when it turns on (is created).
-	var/startup = 'maplestation_modules/story_content/volkan_equipment/audio/bot_startup.ogg' 
+	var/startup = 'maplestation_modules/story_content/volkan_equipment/audio/bot_startup.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
 
 //activate bot action
diff --git a/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi b/maplestation_modules/story_content/volkan_equipment/icons/sun_items.dmi
index 36a808b34ebc900a7a4d20648c747dce4a7da2b1..fad9ba0ee4e90433da6dd4b04dc5e657b72f3689 100644
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00018P)t-s0000_
zPfulKWh^vHJ4Io4cXvoscjwp2%Gu|*qLBIX?(N^ykfgZo^ZC@_?I%5Z+}hdl^71T4
zkuXi3|Ns9VA0Lu`Z_2cyZ-A1bw#sH^W^Qh7nwpy2+1VNz8umiBbN~PV0d!JMQvg8b
z*k%9#0E>E5Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!U
zEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AXBNhG_N?hC^a=NK0P%rwJ0-LiHkEOv#1y-
zXUN5wR+N~V3Snc>k(Zd4Us9A<oSH|1rn3B;>_nUzloee4T)-Xy0E`enhdI=TZvX%Q
z?MXyIR9J=W*2@lpFc5`dYK4vnautzF-~Tb4!upJfqcNKPEGK*!S{EisEcWiqA%y4l
z7!rjvHC!qPmdmifKyctZ%WQDO4Wte24#1o<#yLDEvX%(XPx+b4PiS707p^QY;BwAk
zfJ%-eAZ&nvioym|L7?70p+@tj?YLF~wgjN>yIusY;ekNa^80<;NE-w}1Ud<LdJFp*
zynYMCehVK2h8qj+HlX=<XMye`1d?G3&&Mr1kHuoK|BC<L=-!{ENhO$ho>hWbmPNP0
zq+1|a8CX?-Z@daH-h15{tbYCOA*uoOPdWCZJpe|b4)Z{CDM$bS002ovPDHLkV1kbP
B`v(93

literal 1861
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


From 02fd3215a6ce8cc0ffcdc232460deadd182bd2b9 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:46:53 +1200
Subject: [PATCH 23/28] Update
 maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 .../story_content/volkan_equipment/code/sunitems.dm         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index bdbceff27e99..866c09501b86 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -94,9 +94,9 @@
 	var/burn_modifier = 0.03
 	alert_type = /atom/movable/screen/alert/status_effect/sunscreen
 
-/datum/status_effect/sunscreen/on_creation(mob/living/new_owner, _duration, _burn_modifier)
-	duration = _duration
-	burn_modifier = _burn_modifier
+/datum/status_effect/sunscreen/on_creation(mob/living/new_owner, duration, burn_modifier)
+	src.duration = _duration
+	src.burn_modifier = burn_modifier
 	return ..()
 
 /datum/status_effect/sunscreen/on_apply()

From c37c7828f194ed23535002770b3331b68343f19c Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:47:06 +1200
Subject: [PATCH 24/28] Update
 maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 866c09501b86..dbb2b877cf41 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -91,8 +91,8 @@
 /datum/status_effect/sunscreen
 	id = "sunscreen"
 	duration = 1800 SECONDS
-	var/burn_modifier = 0.03
 	alert_type = /atom/movable/screen/alert/status_effect/sunscreen
+	var/burn_modifier = 0.03
 
 /datum/status_effect/sunscreen/on_creation(mob/living/new_owner, duration, burn_modifier)
 	src.duration = _duration

From d307b112d35c7729bf644790c1b3dd96d05d660e Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:47:36 +1200
Subject: [PATCH 25/28] Update
 maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 .../story_content/volkan_equipment/code/sunitems.dm            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index dbb2b877cf41..f2aff7041411 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -112,5 +112,4 @@
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		H.physiology.burn_mod += burn_modifier
-	owner.visible_message(span_warning("[owner]'s sunscreen dissolves away."),
-		span_notice("Your sunscreen is gone!"))
+	to_chat(owner, span_notice("You no longer feel protected by your sunscreen.")

From 1537f83df934ea16e7410346a3ab0e91cbf6f69e Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 1 Sep 2024 01:03:44 +1200
Subject: [PATCH 26/28] brackett

---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index f2aff7041411..3660db15bac8 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -112,4 +112,4 @@
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		H.physiology.burn_mod += burn_modifier
-	to_chat(owner, span_notice("You no longer feel protected by your sunscreen.")
+	to_chat(owner, span_notice("You no longer feel protected by your sunscreen."))

From 7020713239a64ba2953a452a43eedc1eead486cd Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 1 Sep 2024 01:04:52 +1200
Subject: [PATCH 27/28] ok it compiles now.

---
 .../story_content/volkan_equipment/code/sunitems.dm             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index 3660db15bac8..d8b1a6e19989 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -95,7 +95,7 @@
 	var/burn_modifier = 0.03
 
 /datum/status_effect/sunscreen/on_creation(mob/living/new_owner, duration, burn_modifier)
-	src.duration = _duration
+	src.duration = duration
 	src.burn_modifier = burn_modifier
 	return ..()
 

From 3f4941fc084e3169a3c419aa03096d876652b495 Mon Sep 17 00:00:00 2001
From: Constellado <64122807+Constellado@users.noreply.github.com>
Date: Sun, 1 Sep 2024 01:14:43 +1200
Subject: [PATCH 28/28] code review thingys

---
 .../volkan_equipment/code/sunitems.dm            | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
index d8b1a6e19989..cf03417c4e1c 100644
--- a/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
+++ b/maplestation_modules/story_content/volkan_equipment/code/sunitems.dm
@@ -46,13 +46,16 @@
 	burn_modifier = 0.1
 
 /obj/item/sunscreen/attack_self(mob/user)
-	apply(user, user)
+	if(ishuman(user) && user.is_holding(src))
+		apply(user, user)
 
 /obj/item/sunscreen/examine()
 	. = ..()
 	. += span_info("It's labeled SPF [burn_modifier * 1000]. Reapply in [reaplication_time / 600] minutes.")
 
 /obj/item/sunscreen/interact_with_atom(atom/target, mob/living/user)
+	if(!ishuman(target))
+		return NONE
 	apply(target, user)
 	return ITEM_INTERACT_SUCCESS
 
@@ -78,9 +81,12 @@
 			span_notice("You begin applying [src] on [target]...")
 		)
 
-	if(do_after(user, application_time, user))
+	if(do_after(user, application_time, target))
 		target.apply_status_effect(/datum/status_effect/sunscreen, reaplication_time, burn_modifier)
 
+	target.visible_message(span_warning("[target] has applied sunscreen!"),
+		span_notice("You are covered in sunscreen!"))
+
 //sunscreen status effect
 /atom/movable/screen/alert/status_effect/sunscreen
 	name = "Sunscreen"
@@ -101,10 +107,8 @@
 
 /datum/status_effect/sunscreen/on_apply()
 	if(ishuman(owner))
-		var/mob/living/carbon/human/H = owner
-		H.physiology.burn_mod -= burn_modifier
-	owner.visible_message(span_warning("[owner] has applied sunscreen!"),
-		span_notice("You are covered in sunscreen!"))
+		var/mob/living/carbon/human/applying_to = owner
+		applying_to.physiology.burn_mod -= burn_modifier
 	return ..()
 
 ///Stuff that happens when the sunscreen runs out.