Merge remote-tracking branch 'upstream/master' into le-nukies-mirror

_maps/map_files/generic/CentCom.dmm

@@ -9305,6 +9305,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/white/textured,
 /area/centcom/central_command_areas/evacuation/ship)
+"No" = (
+/obj/effect/turf_decal/tile/dark/opposingcorners,
+/obj/effect/portal/permanent{
+	id = "arena"
+	},
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/observation)
 "Nq" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
@@ -10904,6 +10911,9 @@
 	dir = 8
 	},
 /obj/machinery/light/floor/has_bulb,
+/obj/effect/portal/permanent{
+	id = "arena"
+	},
 /turf/open/floor/wood/parquet,
 /area/centcom/central_command_areas/borbop)
 "Uz" = (
@@ -52202,7 +52212,7 @@ TV
 qM
 Mo
 Jd
-ew
+No
 dh
 QC
 aa

code/__DEFINES/jobs.dm

@@ -80,6 +80,14 @@
 #define JOB_LAWYER "Lawyer"
 #define JOB_CHAPLAIN "Chaplain"
 #define JOB_PSYCHOLOGIST "Psychologist"
+//Spooktober
+#define JOB_SPOOKTOBER_GHOST "Ghost"
+#define JOB_SPOOKTOBER_GODZILLA "Discount Godzilla"
+#define JOB_SPOOKTOBER_WIZARD "Diet Wizard"
+#define JOB_SPOOKTOBER_YELLOWCLOWN "Yellow Clown"
+#define JOB_SPOOKTOBER_SKELETON "Skeleton"
+#define JOB_SPOOKTOBER_CANDYSALESMAN "Candy Salesman"
+#define JOB_SPOOKTOBER_GORILLA "Gorilla"
 //ERTs
 #define JOB_ERT_DEATHSQUAD "Death Commando"
 #define JOB_ERT_COMMANDER "Emergency Response Team Commander"
@@ -164,6 +172,8 @@
 #define DEPARTMENT_ASSISTANT "Assistant"
 #define DEPARTMENT_BITFLAG_CAPTAIN (1<<9)
 #define DEPARTMENT_CAPTAIN "Captain"
+#define DEPARTMENT_BITFLAG_SPOOKTOBER (1<<10)
+#define DEPARTMENT_SPOOKTOBER "Spooktober"
 
 /* Job datum job_flags */
 /// Whether the mob is announced on arrival.
@@ -184,6 +194,8 @@
 #define JOB_ASSIGN_QUIRKS (1<<7)
 /// Whether this job can be an intern.
 #define JOB_CAN_BE_INTERN (1<<8)
+/// Whether this job is enabled/disabled by the spooktober config
+#define JOB_SPOOKTOBER (1<<9)
 
 #define FACTION_NONE "None"
 #define FACTION_STATION "Station"

code/controllers/configuration/entries/game_options.dm

@@ -327,6 +327,8 @@
 /datum/config_entry/string/overflow_job
 	default = JOB_ASSISTANT
 
+/datum/config_entry/flag/spooktober_enabled
+
 /datum/config_entry/flag/grey_assistants
 
 /datum/config_entry/number/lavaland_budget

code/controllers/subsystem/job.dm

@@ -134,6 +134,8 @@ SUBSYSTEM_DEF(job)
 		if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new
 			log_job_debug("Removed [job.title] due to map config")
 			continue
+		if(!CONFIG_GET(flag/spooktober_enabled) && job.job_flags & JOB_SPOOKTOBER) //if spooktober's not enabled, don't load spooktober jobs
+			continue
 		new_all_occupations += job
 		name_occupations[job.title] = job
 		type_occupations[job_type] = job

code/modules/clothing/under/costume.dm

@@ -220,6 +220,7 @@
 	female_sprite_flags = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
+	alternative_screams = list('monkestation/sound/voice/screams/skeleton/scream_skeleton.ogg')
 
 /obj/item/clothing/under/costume/mech_suit
 	name = "mech pilot's suit"

code/modules/jobs/departments/departments.dm

@@ -131,6 +131,13 @@
 	label_class = "silicon"
 	ui_color = "#5dbda0"
 
+/datum/job_department/spooktober
+	department_name = DEPARTMENT_SPOOKTOBER
+	department_bitflags = DEPARTMENT_BITFLAG_SPOOKTOBER
+	display_order = 9
+	label_class = "spooktober"
+	ui_color = "#f05e16"
+
 /datum/job_department/silicon/generate_nation_name()
 	return "United Nations" //For nations ruleset specifically, because all other sources of nation creation cannot choose silicons
 

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

@@ -225,7 +225,7 @@
 	name ="death bolt"
 	icon_state= "chronobolt"
 	damage = 20
-	armour_penetration = 50
+	armour_penetration = 25 //was 50 changed because 50 was waay too much monkestation 20 edit
 	speed = 2
 	eyeblur = 0
 	damage_type = BRUTE

code/modules/unit_tests/create_and_destroy.dm

@@ -119,6 +119,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
 	///we also dont want weathers or weather events as they will hold refs to alot of stuff as they shouldn't be deleted
 	ignore += typesof(/datum/weather_event)
 	ignore += typesof(/datum/particle_weather)
+	ignore += typesof(/mob/living/basic/aquatic)
 
 	var/list/cached_contents = spawn_at.contents.Copy()
 	var/original_turf_type = spawn_at.type
@@ -198,6 +199,8 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
 	//Alright, time to see if anything messed up
 	var/list/cache_for_sonic_speed = SSgarbage.items
 	for(var/path in cache_for_sonic_speed)
+		if(path in ignore)
+			continue
 		var/datum/qdel_item/item = cache_for_sonic_speed[path]
 		if(item.failures)
 			TEST_FAIL("[item.name] hard deleted [item.failures] times out of a total del count of [item.qdels]")

code/modules/unit_tests/lungs.dm

@@ -61,6 +61,8 @@
 
 /datum/unit_test/lungs/lungs_sanity_ashwalker/Run()
 	// Gas mix resembling one cell of lavaland's atmosphere.
+	if(SSmapping.config.map_name == "Oshan Station")
+		return
 	var/datum/gas_mixture/lavaland_test_mix = create_lavaland_mix()
 	var/obj/item/organ/internal/lungs/lavaland/test_lungs = allocate(/obj/item/organ/internal/lungs/lavaland)
 	var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent)

code/modules/vending/autodrobe.dm

@@ -77,6 +77,7 @@
 				/obj/item/clothing/head/costume/shrine_wig = 1,
 				/obj/item/clothing/suit/costume/shrine_maiden = 1,
 				/obj/item/gohei = 1,
+				/obj/item/clothing/under/costume/skeleton = 1,
 			),
 		),
 		list(
@@ -107,6 +108,8 @@
 				/obj/item/clothing/under/suit/white_on_white = 1,
 				/obj/item/clothing/head/tragic = 2,
 				/obj/item/clothing/under/costume/tragic = 2,
+				/obj/item/clothing/mask/gas/clown_hat/yellow = 1,
+				/obj/item/clothing/shoes/clown_shoes/yellow = 1,
 				/obj/item/clothing/head/knowingclown = 2,
 				/obj/item/clothing/under/knowingclown = 2,
 			),
@@ -124,6 +127,7 @@
 				/obj/item/clothing/under/dress/skirt = 1,
 				/obj/item/clothing/neck/tie = 3,
 				/obj/item/clothing/head/hats/tophat = 1,
+				/obj/item/clothing/head/wonka = 1,
 				/obj/item/clothing/under/costume/kilt = 1,
 				/obj/item/clothing/glasses/monocle =1,
 				/obj/item/clothing/head/hats/bowler = 1,
@@ -134,6 +138,7 @@
 				/obj/item/clothing/suit/costume/changshan_blue = 1,
 				/obj/item/clothing/suit/costume/cheongsam_red = 1,
 				/obj/item/clothing/suit/costume/cheongsam_blue = 1,
+				/obj/item/clothing/under/wonka = 1,
 			),
 		),
 		list(
@@ -147,6 +152,7 @@
 				/obj/item/clothing/suit/hooded/carp_costume = 1,
 				/obj/item/clothing/suit/hooded/ian_costume = 1,
 				/obj/item/clothing/suit/hooded/bee_costume = 1,
+				/obj/item/clothing/suit/hooded/dinojammies = 1,
 				/obj/item/clothing/mask/animal/small/bat = 1,
 				/obj/item/clothing/mask/animal/small/bee = 1,
 				/obj/item/clothing/mask/animal/small/bear = 1,
@@ -158,6 +164,7 @@
 				/obj/item/clothing/mask/animal/pig = 1,
 				/obj/item/clothing/mask/animal/cowmask = 1,
 				/obj/item/clothing/mask/animal/horsehead = 1,
+				/obj/item/clothing/head/lizard = 1,
 			),
 		),
 		list(

code/modules/vending/clothesmate.dm

@@ -138,6 +138,7 @@
 				/obj/item/clothing/under/ethereal_tunic = 3,
 
 				/obj/item/clothing/suit/costume/ianshirt = 1,
+				/obj/item/clothing/suit/hooded/dinojammies = 3,
 				/obj/item/clothing/head/costume/irs = 20,
 				/obj/item/clothing/head/costume/tmc = 20,
 				/obj/item/clothing/head/costume/deckers = 20,

code/modules/vending/wardrobes.dm

@@ -169,6 +169,11 @@
 		/obj/item/clothing/head/costume/mailman = 1,
 		/obj/item/clothing/under/misc/mailman = 1,
 	)
+	contraband = list(
+		/obj/item/clothing/under/wonka = 1,
+		/obj/item/clothing/head/wonka = 1,
+		/obj/item/cane = 1
+	)
 	refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
 	payment_department = ACCOUNT_CAR
 

config/game_options.txt

@@ -425,6 +425,9 @@ OVERFLOW_JOB Assistant
 ## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full.
 OVERFLOW_CAP -1
 
+## Enables Spooktober jobs.
+SPOOKTOBER_ENABLED
+
 ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
 #GREY_ASSISTANTS
 

html/changelogs/AutoChangeLog-pr-457.yml

@@ -0,0 +1,4 @@
+author: "TTNT789"
+delete-after: True
+changes:
+  - balance: "halves heralds armor pierce"

html/changelogs/archive/2023-10.yml

@@ -100,3 +100,8 @@
   - rscadd: Cool Glerm Pet Beacon
   - rscadd: Ordinary Flash
   - rscadd: Ordinary Flash Pet Beacon
+2023-10-15:
+  KoboldCommando:
+  - rscadd: 7 new latejoin spooktober jobs!
+  wraith-54321:
+  - bugfix: clockwork armaments now actually gives weapons again

monkestation/code/datums/patreon_data.dm

@@ -41,6 +41,8 @@
 		if(query_get_rank.NextRow())
 			if(query_get_rank.item[1])
 				owned_rank = query_get_rank.item[1]
+				if(owned_rank == "UNSUBBED2")
+					owned_rank = NO_RANK
 			else
 				owned_rank = NO_RANK
 	qdel(query_get_rank)

monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm

@@ -37,4 +37,4 @@
 
 	base_outfit.equip(invoker)
 
-	invoker.put_in_hands(new weapon_path, FALSE, forced = FALSE)
+	invoker.put_in_hands(new weapon_path, FALSE)

monkestation/code/modules/clothing/head/costume.dm

@@ -15,10 +15,26 @@
 	flags_inv = HIDEHAIR
 	worn_y_offset = 2
 
+/obj/item/clothing/head/lizard
+	name = "novelty lizard head"
+	desc = "A giant sculpted foam lizard head.  It doesn't quite look like the lizards from this sector..."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "lizardhead"
+	flags_inv = HIDEHAIR
+	worn_y_offset = 1
+
+/obj/item/clothing/head/wonka
+	name = "wonky hat"
+	desc = "Come with me, and you'll be, in a world of OSHA violations!"
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "wonka"
+
 /obj/item/clothing/head/knowingclown
 	name = "Small but Knowing Clown hat"
 	desc = "The Cap of a Small but All Knowing Clown"
 	icon = 'monkestation/icons/obj/clothing/hats.dmi'
 	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
 	icon_state = "knowingclownhat"
-	worn_y_offset = 6
+	worn_y_offset = 6

monkestation/code/modules/clothing/masks/gasmask.dm

@@ -0,0 +1,7 @@
+/obj/item/clothing/mask/gas/clown_hat/yellow
+	name = "yellow clown wig and mask"
+	desc = "A true prankster's facial attire. But yellow! A clown is incomplete without his wig and mask."
+	icon = 'monkestation/icons/obj/clothing/masks.dmi'
+	icon_state = "clown_yellow"
+	worn_icon = 'monkestation/icons/mob/clothing/mask.dmi'
+	worn_icon_state = "clown_yellow"

monkestation/code/modules/clothing/shoes/clown.dm

@@ -0,0 +1,7 @@
+/obj/item/clothing/shoes/clown_shoes/yellow
+	desc = "The prankster's standard-issue clowning shoes. But Yellow! Ctrl-click to toggle waddle dampeners."
+	name = "yellow clown shoes"
+	icon = 'monkestation/icons/obj/clothing/shoes.dmi'
+	icon_state = "clown_yellow"
+	worn_icon = 'monkestation/icons/mob/clothing/feet.dmi'
+	worn_icon_state = "clown_yellow"

monkestation/code/modules/clothing/suits/costume.dm

@@ -0,0 +1,34 @@
+/obj/item/clothing/suit/hooded/dinojammies
+	name = "dinosaur pajamas"
+	desc = "The ultimate in reptile-pajama-costume fusion."
+	icon = 'monkestation/icons/obj/clothing/suits.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+	icon_state = "dinojammies"
+	worn_icon_state = "dinojammies"
+	hoodtype = /obj/item/clothing/head/hooded/dinojammies
+
+/obj/item/clothing/head/hooded/dinojammies
+	desc = "A dinosaur head hood."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "dinojammies_hood"
+	worn_icon_state = "dinojammies_hood"
+	flags_inv = HIDEHAIR
+
+/obj/item/clothing/suit/hooded/gorilla
+	name = "gorilla costume"
+	desc = "Ooga!"
+	icon = 'monkestation/icons/obj/clothing/suits.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/suit.dmi'
+	icon_state = "gorilla"
+	worn_icon_state = "gorilla"
+	hoodtype = /obj/item/clothing/head/hooded/gorilla
+	alternative_screams = list('sound/creatures/gorilla.ogg')
+
+/obj/item/clothing/head/hooded/gorilla
+	desc = "A gorilla costume hood."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "gorilla"
+	worn_icon_state = "gorilla"
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT

monkestation/code/modules/clothing/under/undersuit.dm

@@ -67,3 +67,11 @@
 /obj/item/clothing/under/rank/civilian/janitor/maid //heckin subtypes
 	icon = 'icons/obj/clothing/under/civilian.dmi'
 	worn_icon = 'icons/mob/clothing/under/civilian.dmi'
+
+/obj/item/clothing/under/wonka
+	name = "wonky suit"
+	desc = "Come with me, and you'll be, in a world of OSHA violations!"
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	icon_state = "wonka"
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	worn_icon_state = "wonka"

monkestation/code/modules/jobs/job_types/candysalesman.dm

@@ -0,0 +1,46 @@
+/datum/job/candysalesman
+	title = JOB_SPOOKTOBER_CANDYSALESMAN
+	description = "Sell candy to the crew. Get high on your own supply. Subject people to unsafe working conditions."
+	faction = FACTION_STATION
+	total_positions = 1
+	spawn_positions = 0
+	supervisors = JOB_HEAD_OF_PERSONNEL
+	exp_granted_type = EXP_TYPE_CREW
+
+	outfit = /datum/outfit/job/candysalesman
+	plasmaman_outfit = /datum/outfit/plasmaman
+
+	paycheck = PAYCHECK_LOWER
+	paycheck_department = ACCOUNT_CIV
+
+	display_order = JOB_DISPLAY_ORDER_ASSISTANT
+
+	departments_list = list(
+		 /datum/job_department/spooktober,
+		)
+
+	family_heirlooms = list(/obj/item/cane)
+
+	mail_goodies = list(
+		/obj/item/storage/spooky
+	)
+
+	rpg_title = "Purveyor of Sweets"
+	job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER
+
+/datum/outfit/job/candysalesman
+	name = "Candy Salesman"
+	jobtype = /datum/job/candysalesman
+
+	head = /obj/item/clothing/head/wonka
+	uniform = /obj/item/clothing/under/wonka
+	id_trim = /datum/id_trim/job/assistant
+	belt = /obj/item/modular_computer/pda/assistant
+
+	backpack_contents = list(
+		/obj/item/cane,
+		/obj/item/storage/pill_bottle/maintenance_pill/full,
+		/obj/item/storage/spooky,
+		/obj/item/storage/spooky,
+		/obj/item/storage/spooky
+	)