diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm
index 58f129c3..881c9161 100644
--- a/_maps/map_files/Mining/Lavaland_Lower.dmm
+++ b/_maps/map_files/Mining/Lavaland_Lower.dmm
@@ -106,6 +106,9 @@
name = "Theatre air alarm";
pixel_y = 24
},
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aw" = (
@@ -193,13 +196,13 @@
/turf/open/floor/plasteel,
/area/xenoarch/gen)
"aL" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/machinery/door/airlock/maintenance{
dir = 4;
name = "Theather Room"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel,
/area/xenoarch/gen)
"aM" = (
@@ -225,14 +228,11 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aQ" = (
-/obj/structure/chair/comfy/black{
- dir = 8
+/obj/item/shield/riot/egyptian{
+ pixel_x = 20
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/turf/open/indestructible/necropolis,
+/area/lavaland/surface/outdoors)
"aR" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/loading_area{
@@ -425,17 +425,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
-"bv" = (
/obj/structure/chair/comfy/black{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
+"bv" = (
+/obj/machinery/door/airlock/maintenance{
+ dir = 4;
+ name = "Theather Room"
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"bw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/turf/open/floor/plasteel,
@@ -480,6 +481,9 @@
dir = 1;
network = list("ss13","rd","mine")
},
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bE" = (
@@ -6586,6 +6590,12 @@
/area/xenoarch/bot{
name = "Demon Teleporter"
})
+"sI" = (
+/obj/item/melee/cultblade{
+ pixel_x = -20
+ },
+/turf/open/indestructible/necropolis,
+/area/lavaland/surface/outdoors)
"sO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6664,6 +6674,12 @@
/area/xenoarch/bot{
name = "Demon Teleporter"
})
+"Dd" = (
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
+/turf/open/floor/carpet/red,
+/area/xenoarch/gen)
"Ed" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6735,10 +6751,9 @@
/turf/open/floor/plasteel/grimy,
/area/xenoarch/nothinghere)
"GS" = (
-/obj/effect/turf_decal/tile{
- color = "8F96AD"
+/turf/open/floor/plasteel/dark/side{
+ dir = 9
},
-/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"Hx" = (
/turf/open/floor/carpet,
@@ -6773,11 +6788,9 @@
name = "Demon Teleporter"
})
"Kd" = (
-/obj/effect/turf_decal/tile{
- color = "#8F96AD";
- dir = 8
+/turf/open/floor/plasteel/dark/side{
+ dir = 5
},
-/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"Ku" = (
/turf/closed/wall/r_wall/rust,
@@ -8926,7 +8939,7 @@ as
fK
aM
fK
-fK
+ba
Sy
bW
Sy
@@ -9182,7 +9195,7 @@ Sy
at
aE
aM
-ba
+fK
bs
Sy
bX
@@ -9439,7 +9452,7 @@ Sy
Sy
Sy
aL
-Sy
+bv
kP
Sy
ar
@@ -9482,7 +9495,7 @@ ay
ms
mz
mz
-mz
+aQ
mz
mz
mz
@@ -9698,7 +9711,7 @@ ik
aO
ik
bt
-lR
+Dd
ar
cj
cH
@@ -9955,7 +9968,7 @@ ik
aO
ik
bt
-el
+ik
ar
ck
cI
@@ -9996,7 +10009,7 @@ ay
ms
mz
mz
-mz
+sI
mz
mz
mz
@@ -10212,7 +10225,7 @@ ik
aO
ik
bt
-el
+ik
ar
cl
cJ
@@ -10468,7 +10481,7 @@ au
ik
aO
ik
-bu
+bt
bC
ar
ar
@@ -10722,7 +10735,7 @@ ab
ab
Sy
av
-el
+ax
aP
el
bu
@@ -10980,10 +10993,10 @@ ab
Sy
ax
ax
-aQ
-ax
-bv
+aP
el
+bu
+ax
ar
ck
cN
@@ -11237,10 +11250,10 @@ ab
Sy
ax
ax
-aQ
-ax
-bv
+aP
el
+bu
+ax
ar
cn
cO
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index b9297755..9f283a4d 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -1,65 +1,69 @@
-//Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
-/datum/weather/rad_storm
- name = "radiation storm"
- desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
+// //Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
+// /datum/weather/rad_storm
+// name = "radiation storm"
+// desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
- telegraph_duration = 400
- telegraph_message = "The air begins to grow warm."
+// telegraph_duration = 400
+// telegraph_message = "The air begins to grow warm."
- weather_message = "You feel waves of heat wash over you! Find shelter!"
- weather_overlay = "ash_storm"
- weather_duration_lower = 600
- weather_duration_upper = 1500
- weather_color = "green"
- weather_sound = 'sound/misc/bloblarm.ogg'
+// weather_message = "You feel waves of heat wash over you! Find shelter!"
+// weather_overlay = "ash_storm"
+// weather_duration_lower = 600
+// weather_duration_upper = 1500
+// weather_color = "green"
+// weather_sound = 'sound/misc/bloblarm.ogg'
- end_duration = 100
- end_message = "The air seems to be cooling off again."
+// end_duration = 100
+// end_message = "The air seems to be cooling off again."
- area_type = /area
- protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
- /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
- target_trait = ZTRAIT_STATION
+// area_type = /area
+// protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
+// /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
+// target_trait = ZTRAIT_STATION
- immunity_type = "rad"
+// immunity_type = "rad"
-/datum/weather/rad_storm/telegraph()
- ..()
- status_alarm(TRUE)
+// /datum/weather/rad_storm/telegraph()
+// ..()
+// status_alarm(TRUE)
-/datum/weather/rad_storm/weather_act(mob/living/L)
- var/resist = L.getarmor(null, "rad")
- if(prob(40))
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
- if(prob(max(0,100-resist)))
- H.randmuti()
- if(prob(50))
- if(prob(90))
- H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
- else
- H.easy_randmut(POSITIVE)
- H.domutcheck()
- L.rad_act(20)
+// /datum/weather/rad_storm/weather_act(mob/living/L)
+// var/resist = L.getarmor(null, "rad")
+// if(prob(40))
+// if(ishuman(L))
+// var/mob/living/carbon/human/H = L
+// if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
+// if(prob(max(0,100-resist)))
+// H.randmuti()
+// if(prob(50))
+// if(prob(90))
+// H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
+// else
+// H.easy_randmut(POSITIVE)
+// H.domutcheck()
+// L.rad_act(20)
-/datum/weather/rad_storm/end()
- if(..())
- return
- priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
- status_alarm(FALSE)
+// /datum/weather/rad_storm/end()
+// if(..())
+// return
+// priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
+// status_alarm(FALSE)
-/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
- var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
- if(!frequency)
- return
+// /datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
+// var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
+// if(!frequency)
+// return
- var/datum/signal/signal = new
- if (active)
- signal.data["command"] = "alert"
- signal.data["picture_state"] = "radiation"
- else
- signal.data["command"] = "shuttle"
+// var/datum/signal/signal = new
+// if (active)
+// signal.data["command"] = "alert"
+// signal.data["picture_state"] = "radiation"
+// else
+// signal.data["command"] = "shuttle"
- var/atom/movable/virtualspeaker/virt = new(null)
- frequency.post_signal(virt, signal)
+// var/atom/movable/virtualspeaker/virt = new(null)
+// frequency.post_signal(virt, signal)
+
+
+
+// GS13 tweak: Removed radstorms due to how disruptive they were to QoL and RP quality - Sono
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 82d78480..f3551410 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -1023,9 +1023,9 @@ structure_check() searches for nearby cultist structures required for the invoca
var/datum/round_event_control/mice_migration/M = new()
D.runEvent()
M.runEvent()
- if(11 to 20)
- var/datum/round_event_control/radiation_storm/RS = new()
- RS.runEvent()
+ // if(11 to 20)
+ // var/datum/round_event_control/radiation_storm/RS = new()
+ // RS.runEvent()
if(21 to 30)
var/datum/round_event_control/brand_intelligence/BI = new()
BI.runEvent()
diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm
index 6042550d..163bb87b 100644
--- a/code/modules/events/heart_attack.dm
+++ b/code/modules/events/heart_attack.dm
@@ -2,8 +2,10 @@
name = "Random Heart Attack"
typepath = /datum/round_event/heart_attack
weight = 20
- max_occurrences = 2
- min_players = 40 // To avoid shafting lowpop
+ max_occurrences = 0
+ min_players = 400 // To avoid shafting lowpop
+
+ // Made the event impossible to come across to bolster server's RP quality a bit - Sono
/datum/round_event/heart_attack/start()
var/list/heart_attack_contestants = list()
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index c9142e20..28a8db9b 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -1,19 +1,19 @@
-/datum/round_event_control/radiation_storm
- name = "Radiation Storm"
- typepath = /datum/round_event/radiation_storm
- max_occurrences = 1
+// /datum/round_event_control/radiation_storm
+// name = "Radiation Storm"
+// typepath = /datum/round_event/radiation_storm
+// max_occurrences = 1
-/datum/round_event/radiation_storm
+// /datum/round_event/radiation_storm
-/datum/round_event/radiation_storm/setup()
- startWhen = 3
- endWhen = startWhen + 1
- announceWhen = 1
+// /datum/round_event/radiation_storm/setup()
+// startWhen = 3
+// endWhen = startWhen + 1
+// announceWhen = 1
-/datum/round_event/radiation_storm/announce(fake)
- priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
- //sound not longer matches the text, but an audible warning is probably good
+// /datum/round_event/radiation_storm/announce(fake)
+// priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
+// //sound not longer matches the text, but an audible warning is probably good
-/datum/round_event/radiation_storm/start()
- SSweather.run_weather(/datum/weather/rad_storm)
+// /datum/round_event/radiation_storm/start()
+// SSweather.run_weather(/datum/weather/rad_storm)
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
index 64828123..b332afc4 100644
--- a/code/modules/events/spontaneous_appendicitis.dm
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -2,9 +2,11 @@
name = "Spontaneous Appendicitis"
typepath = /datum/round_event/spontaneous_appendicitis
weight = 20
- max_occurrences = 4
- earliest_start = 10 MINUTES
- min_players = 5 // To make your chance of getting help a bit higher.
+ max_occurrences = 0
+ earliest_start = 900 MINUTES
+ min_players = 100
+
+ // I made the event practically impossible, as an RP tweak - Sono
/datum/round_event/spontaneous_appendicitis
fakeable = FALSE
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 4e2aece1..2820bd2a 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -751,7 +751,7 @@
tastes = list("pastry" = 1, "sweetness" = 1)
foodtype = GRAIN | SUGAR
-#define PANCAKE_MAX_STACK 10
+#define PANCAKE_MAX_STACK 20 //Doubled the stacking size. Snack away, snacksters! - Sono
/obj/item/reagent_containers/food/snacks/pancakes
name = "pancake"
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 8355462c..325514a6 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -5,8 +5,8 @@
default_color = "59CE00"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR,WINGCOLOR)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
- mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings")
- default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "None", "snout" = "None", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "taur" = "None", "deco_wings" = "None")
+ mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts","mam_waggingtail","spines", "horns", "frills", "legs", "taur", "deco_wings")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "None", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs", "deco_wings" = "None", "horns" = "None", "frills" = "None", "spines" = "None")
attack_verb = "slash"
attack_sound = 'sound/weapons/slice.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/config/custom_roundstart_items.txt b/config/custom_roundstart_items.txt
index 8c5a87a6..a0a8e415 100644
--- a/config/custom_roundstart_items.txt
+++ b/config/custom_roundstart_items.txt
@@ -7,4 +7,8 @@
//test1|Memename Lastname|testjob1|/obj/item/device/aicard=3;/obj/item/device/flightpack=1;/obj/item/gun/energy=3
//kevinz000|Skylar Lineman|ALL|/obj/item/bikehorn/airhorn=1
//kevinz000|ALL|Clown|/obj/item/bikehorn=1
-JayEhh|ALL|ALL|/obj/item/custom/ceb_soap=1
\ No newline at end of file
+JayEhh|ALL|ALL|/obj/item/custom/ceb_soap=1
+
+
+Sonoida|Dezir Rose|ALL|/obj/item/grown/rose=1
+Sonoida|Desert Rose|ALL|/obj/item/grown/rose=1
\ No newline at end of file
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 640c4c0c..742b9ad1 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ