Merge remote-tracking branch 'origin/master' into donatoritems111923

code/modules/events/_event.dm

@@ -333,7 +333,7 @@ Runs the event
 						return
 			message_admins("[key_name_admin(usr)] force scheduled event [src.name].")
 			log_admin_private("[key_name(usr)] force scheduled event [src.name].")
-			SSgamemode.forced_next_events[src.track] += src
+			SSgamemode.forced_next_events[src.track] = src
 
 //monkestation addition ends - STORYTELLERS
 

code/modules/hydroponics/grown/berries.dm

@@ -187,3 +187,33 @@
 	juice_results = list(/datum/reagent/consumable/toechtauese_juice = 0)
 	tastes = list("fiery itchy pain" = 1)
 	distill_reagent = /datum/reagent/toxin/itching_powder
+
+/obj/item/seeds/lanternfruit
+	name = "pack of lanternfruit seeds"
+	desc = "These seeds grow into lanternfruit pods."
+	icon_state = "seed-lanternfruit"
+	species = "lanternfruit"
+	plantname = "Lanternfruit Pod"
+	product = /obj/item/food/grown/lanternfruit
+	lifespan = 50
+	endurance = 30
+	maturation = 25
+	production = 25
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+	icon_grow = "lanternfruit-grow"
+	icon_dead = "lanternfruit-dead"
+	icon_harvest = "lanternfruit-harvest"
+	genes = list(/datum/plant_gene/trait/glow/yellow)
+	mutatelist = null
+	reagents_add = list(/datum/reagent/sulfur = 0.07, /datum/reagent/consumable/sugar = 0.07, /datum/reagent/consumable/liquidelectricity = 0.07)
+	graft_gene = /datum/plant_gene/trait/glow/yellow
+
+/obj/item/food/grown/lanternfruit
+	seed = /obj/item/seeds/lanternfruit
+	name = "lanternfruits"
+	desc = "A sofly glowing fruit with a handle-shaped stem, an Ethereal favorite!"
+	icon_state = "lanternfruit"
+	foodtypes = FRUIT
+	tastes = list("tv static" = 1, "sour pear" = 1, "grapefruit" = 1)
+	distill_reagent = /datum/reagent/consumable/ethanol/fruit_wine

code/modules/mob/living/emote.dm

@@ -224,6 +224,16 @@
 	message = "jumps!"
 	hands_use_check = TRUE
 
+/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
+	animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
+
+/datum/emote/living/jump/get_sound(mob/living/user)
+	return 'sound/weapons/thudswoosh.ogg'
+
 /datum/emote/living/kiss
 	key = "kiss"
 	key_third_person = "kisses"
@@ -347,6 +357,18 @@
 	key_third_person = "shiver"
 	message = "shivers."
 
+#define SHIVER_LOOP_DURATION (1 SECONDS)
+/datum/emote/living/shiver/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+	for(var/i in 1 to SHIVER_LOOP_DURATION / (0.2 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
+		animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+		animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+	animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+#undef SHIVER_LOOP_DURATION
+
 /datum/emote/living/sigh
 	key = "sigh"
 	key_third_person = "sighs"
@@ -437,6 +459,16 @@
 	key_third_person = "sways"
 	message = "sways around dizzily."
 
+/datum/emote/living/sway/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_x = user.pixel_x + 2, time = 0.5 SECONDS)
+	for(var/i in 1 to 2)
+		animate(pixel_x = user.pixel_x - 4, time = 1.0 SECONDS)
+		animate(pixel_x = user.pixel_x + 4, time = 1.0 SECONDS)
+	animate(pixel_x = user.pixel_x - 2, time = 0.5 SECONDS)
+
 /datum/emote/living/tilt
 	key = "tilt"
 	key_third_person = "tilts"
@@ -447,15 +479,44 @@
 	key_third_person = "trembles"
 	message = "trembles in fear!"
 
+#define TREMBLE_LOOP_DURATION (4.4 SECONDS)
+/datum/emote/living/tremble/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
+	for(var/i in 1 to TREMBLE_LOOP_DURATION / (0.4 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
+		animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
+		animate(pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
+	animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
+#undef TREMBLE_LOOP_DURATION
+
 /datum/emote/living/twitch
 	key = "twitch"
 	key_third_person = "twitches"
 	message = "twitches violently."
 
+/datum/emote/living/twitch/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+	animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+	animate(time = 0.1 SECONDS)
+	animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+	animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+
 /datum/emote/living/twitch_s
 	key = "twitch_s"
 	message = "twitches."
 
+/datum/emote/living/twitch_s/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	if(!.)
+		return FALSE
+	animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+	animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+
 /datum/emote/living/wave
 	key = "wave"
 	key_third_person = "waves"

code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm

@@ -138,9 +138,7 @@
 	if(target)
 		H.original = target
 	H.fire(set_angle)
-	if(is_trishot)
-		shoot_projectile(marker, set_angle + 15, FALSE, FALSE)
-		shoot_projectile(marker, set_angle - 15, FALSE, FALSE)
+	//monke edit - removed heralds shotgun BS from his tri shot
 
 /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_trishot(target)
 	ranged_cooldown = world.time + 30

code/modules/reagents/reagent_containers/hypospray.dm

@@ -255,7 +255,7 @@
 		return
 
 	to_chat(user,span_notice("You start manually releasing the low-pressure gauge..."))
-	if(!do_after(user, 0.5 SECONDS, affected_mob, interaction_key = DOAFTER_SOURCE_SURVIVALPEN))
+	if(!do_after(user, 10 SECONDS, affected_mob, interaction_key = DOAFTER_SOURCE_SURVIVALPEN))
 		return
 
 	amount_per_transfer_from_this = initial(amount_per_transfer_from_this) * 0.5

code/modules/vending/clothesmate.dm

@@ -21,6 +21,7 @@
 				/obj/item/clothing/neck/scarf = 6,
 				/obj/item/clothing/neck/large_scarf = 6,
 				/obj/item/clothing/neck/infinity_scarf = 6,
+				/obj/item/clothing/neck/ascot = 6,
 				/obj/item/clothing/neck/tie = 6,
 				/obj/item/clothing/head/rasta = 3,
 				/obj/item/clothing/head/chaplain/kippah = 3,

code/modules/vending/megaseed.dm

@@ -20,6 +20,7 @@
 				/obj/item/seeds/cocoapod = 3,
 				/obj/item/seeds/eggplant = 3,
 				/obj/item/seeds/grape = 3,
+				/obj/item/seeds/lanternfruit = 3,
 				/obj/item/seeds/lemon = 3,
 				/obj/item/seeds/lime = 3,
 				/obj/item/seeds/olive = 3,

code/modules/vending/security.dm

@@ -32,6 +32,9 @@
 		/obj/item/watertank/pepperspray = 2,
 		/obj/item/storage/belt/holster/energy = 4,
 		/obj/item/ammo_box/magazine/m35 = 5, //monkestation edit: Paco sec
+		/obj/item/clothing/head/guardmanhelmet = 1, //monkestation edit: Guardman
+		/obj/item/clothing/under/guardmanuniform = 1, //monkestation edit: Guardman
+		/obj/item/clothing/suit/armor/guardmanvest = 1, //monkestation edit: Guardman
 	)
 	refill_canister = /obj/item/vending_refill/security
 	default_price = PAYCHECK_CREW

html/changelogs/AutoChangeLog-pr-513.yml

@@ -0,0 +1,9 @@
+author: "KittyNoodle"
+delete-after: True
+changes:
+  - rscadd: "Nuke ops have been authorized for a new experimental combat implant."
+  - qol: "Stacking hardlight spears now stores it in only one spell. And it looks really cool."
+  - qol: "Hardlight spears no longer delete themselves after 10 seconds."
+  - balance: "Hardlight spears now do much more damage."
+  - image: "resprited the hardlight spear"
+  - refactor: "Hardlight spears use projectiles instead of throws now."

html/changelogs/AutoChangeLog-pr-553.yml

@@ -0,0 +1,5 @@
+author: "Bidlink1"
+delete-after: True
+changes:
+  - rscadd: "Lanternfruit to Megaservitor (courtesy of MrMelbert)"
+  - rscadd: "Adds Sulfur and Liquid Electricity production as a gene in Lantern fruit"

html/changelogs/AutoChangeLog-pr-574.yml

@@ -0,0 +1,4 @@
+author: "NicoDeLuna"
+delete-after: True
+changes:
+  - bugfix: "adjusting sprites of the ascot"

html/changelogs/archive/2023-11.yml

@@ -57,3 +57,29 @@
   - rscadd: new bar
   wraith-54321:
   - rscadd: map template for contests
+2023-11-14:
+  lmenvs:
+  - rscadd: TTNT's donator item set!
+2023-11-15:
+  Glyphee:
+  - bugfix: changed atmos on the dirt tiles to `"o2=22;n2=82;TEMP=293.15"`
+  wraith-54321:
+  - bugfix: Admins can now actually force events
+  - bugfix: fixed some midrounds spawning without their antag datum
+2023-11-18:
+  Glyphee:
+  - rscadd: Changed how my office looks :p
+  - bugfix: Fixed a typo in the medbay of CC ("all in one medial fabricator" -> "all
+      in one medical fabricator")
+  NicoDeLuna:
+  - rscadd: ' Added Ascots to Loadout and Clothesmate'
+  - rscadd: Add new Guardman's uniform, vest and helmet to the sectech vendor
+  Salted-Zen:
+  - balance: Herald triple shot no longer shotgun fans. Its just three projectiles.
+  kawoppi, gboster:
+  - rscadd: 'kawoppi: added animations to the *jump, *shiver, *sway, *tremble, *twitch
+      and *twitch_s emotes'
+  - rscadd: 'kawoppi: the *jump emote now plays a sound'
+  wraith-54321:
+  - balance: Reverts our change making miner medipens take only half a second to use
+      on station

monkestation/_maps/RandomBars/Tram/tram_slum_bar.dmm

@@ -156,7 +156,9 @@
 /area/station/service/kitchen)
 "hb" = (
 /obj/machinery/light/dim/directional/west,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt{
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+	},
 /area/station/commons/lounge)
 "he" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -547,7 +549,9 @@
 /area/station/service/theater)
 "vb" = (
 /obj/effect/landmark/start/hangover,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt{
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+	},
 /area/station/commons/lounge)
 "vA" = (
 /obj/structure/chair/stool/directional/east,
@@ -742,7 +746,9 @@
 /turf/open/floor/wood/tile,
 /area/station/service/bar/atrium)
 "Co" = (
-/turf/open/misc/dirt,
+/turf/open/misc/dirt{
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+	},
 /area/station/commons/lounge)
 "Cs" = (
 /obj/effect/decal/cleanable/dirt,
@@ -783,7 +789,9 @@
 /area/station/service/theater)
 "Eu" = (
 /obj/effect/landmark/start/assistant,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt{
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+	},
 /area/station/commons/lounge)
 "EE" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1114,7 +1122,9 @@
 /area/station/service/theater)
 "RK" = (
 /obj/machinery/light/dim/directional/north,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt{
+	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+	},
 /area/station/commons/lounge)
 "RT" = (
 /obj/structure/table/wood,