grah

_maps/map_files/Mining/Oshan.dmm

@@ -169,11 +169,11 @@
 /turf/open/floor/iron/dark,
 /area/station/security/prison/visit)
 "ip" = (
+/obj/structure/fans/tiny/forcefield,
 /obj/machinery/conveyor{
 	dir = 1;
-	id = "garbage"
+	id = "gulag"
 	},
-/obj/structure/fans/tiny/forcefield,
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "it" = (
@@ -539,6 +539,7 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/prisongate,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/visit)
 "yj" = (
@@ -622,7 +623,7 @@
 "By" = (
 /obj/machinery/conveyor{
 	dir = 1;
-	id = "garbage"
+	id = "gulag"
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
@@ -668,6 +669,7 @@
 "Dn" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
+/obj/machinery/prisongate,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/visit)
 "DO" = (
@@ -704,7 +706,7 @@
 /area/station/security/prison/shower)
 "EP" = (
 /obj/machinery/conveyor{
-	id = "mining_internal"
+	id = "gulag"
 	},
 /turf/open/floor/plating/ocean/dark,
 /area/station/security/prison)
@@ -751,7 +753,7 @@
 "Gp" = (
 /obj/machinery/conveyor{
 	dir = 8;
-	id = "garbage"
+	id = "gulag"
 	},
 /turf/open/floor/plating/ocean/dark,
 /area/station/security/prison)
@@ -843,10 +845,10 @@
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "KK" = (
+/obj/structure/fans/tiny/forcefield,
 /obj/machinery/conveyor{
-	id = "mining_internal"
+	id = "gulag"
 	},
-/obj/structure/fans/tiny/forcefield,
 /obj/structure/plasticflaps,
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
@@ -987,6 +989,11 @@
 /obj/effect/landmark/start/prisoner,
 /turf/open/floor/iron/white,
 /area/station/security/prison/rec)
+"Sq" = (
+/obj/item/stack/license_plates/empty/fifty,
+/obj/structure/rack,
+/turf/open/floor/iron,
+/area/station/security/prison/work)
 "SB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
@@ -1047,6 +1054,8 @@
 /area/station/security/prison)
 "VQ" = (
 /obj/machinery/camera/autoname/directional/north,
+/obj/item/stack/license_plates/empty/fifty,
+/obj/structure/rack,
 /turf/open/floor/iron,
 /area/station/security/prison/work)
 "VU" = (
@@ -23918,8 +23927,8 @@ qu
 qu
 wF
 wF
-hX
-hX
+Sq
+Sq
 hX
 st
 Hc
@@ -24687,7 +24696,7 @@ qu
 qu
 wF
 wF
-hX
+Sq
 bd
 gn
 gn

code/__DEFINES/liquids.dm

@@ -78,6 +78,8 @@
 
 #define SUBMERGEMENT_PERCENT(carbon, liquids) min(1,(!MOBILITY_STAND ? liquids.liquid_group.group_overlay_state+LYING_DOWN_SUBMERGEMENT_STATE_BONUS : liquids.liquid_group.group_overlay_state)/TOTAL_LIQUID_STATES)
 
+#define LIQUID_PROTECTION "liquid_protection"
+
 GLOBAL_LIST_INIT(liquid_blacklist, list(
 	/datum/reagent/sorium,
 	/datum/reagent/liquid_dark_matter

code/__DEFINES/traits.dm

@@ -714,6 +714,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_KLEPTOMANIAC		"kleptomaniac"
 #define TRAIT_ANIME				"anime"
 #define TRAIT_CAT				"cat"
+#define TRAIT_HIDDEN_IMAGE		"generic-hidden-image"
+#define TRAIT_HIDDEN_CLOWN		"clown_disbelief"
 
 /// Gives you the Shifty Eyes quirk, rarely making people who examine you think you examined them back even when you didn't
 #define TRAIT_SHIFTY_EYES "shifty_eyes"

code/_globalvars/traits.dm

@@ -166,6 +166,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNSTABLE_ASS" = TRAIT_UNSTABLE_ASS,
 		"TRAIT_STABLE_ASS" = TRAIT_STABLE_ASS,
 		"TRAIT_ANIME" = TRAIT_ANIME,
+		"TRAIT_HIDDEN_IMAGE" = TRAIT_HIDDEN_IMAGE,
+		"TRAIT_HIDDEN_CLOWN" = TRAIT_HIDDEN_CLOWN,
 		"TRAIT_SMOKER" = TRAIT_SMOKER,
 		"TRAIT_EMPATH" = TRAIT_EMPATH,
 		"TRAIT_FRIENDLY" = TRAIT_FRIENDLY,

code/datums/outfit.dm

@@ -249,7 +249,7 @@
 				var/obj/item/tank/internals/internals = H.is_holding_item_of_type(/obj/item/tank/internals)
 				if(internals)
 					H.open_internals(internals)
-			else 
+			else
 				H.open_internals(H.get_item_by_slot(internals_slot))
 		if(implants)
 			for(var/implant_type in implants)

code/game/machinery/computer/arcade/orion.dm

@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events())
 	if(!(gamer in gamers))
 		gamers[gamer] = 0
 
-	gamers[gamer]++ // How many times the player has 'prestiged' (massacred their crew)
+	gamers[gamer]++ // How many games the gamer has 'gamed' (massacred their crew)
 
 	if(gamers[gamer] > ORION_GAMER_REPORT_THRESHOLD && prob(20 * gamers[gamer]))
 

code/modules/antagonists/pirate/pirate_event.dm

@@ -17,7 +17,11 @@
 
 /datum/round_event/pirates
 	///admin chosen pirate team
-	var/list/datum/pirate_gang/gang_list
+	var/list/datum/pirate_gang/gang_list = list(
+		/datum/pirate_gang/psykers,
+		/datum/pirate_gang/skeletons,
+		/datum/pirate_gang/rogues
+	)
 
 /datum/round_event/pirates/start()
 	send_pirate_threat(gang_list)

code/modules/cargo/orderconsole.dm

@@ -36,6 +36,8 @@
 	var/cargo_account = ACCOUNT_CAR
 	///Interface name for the ui_interact call for different subtypes.
 	var/interface_type = "Cargo"
+	/// are we currently_sending to an ocean point?
+	var/currently_sending = FALSE
 
 /obj/machinery/computer/cargo/request
 	name = "supply request console"
@@ -296,6 +298,9 @@
 		return
 	switch(action)
 		if("send")
+			if(currently_sending)
+				say("Contents are already on their way")
+				return
 			if(!SSshuttle.supply.canMove())
 				say(safety_warning)
 				return
@@ -341,6 +346,7 @@
 				if(!length(GLOB.cargo_launch_points))
 					stack_trace("Erm, we are attempting to launch cargo crates on a map with no cargo landing points")
 					return
+				currently_sending = TRUE
 				var/list/goodies_by_buyer = list()
 				for(var/datum/supply_order/order as anything in SSshuttle.shopping_list)
 
@@ -384,6 +390,7 @@
 					SSshuttle.shopping_list -= order
 					var/distance = get_dist(spawning_turf, picked_point)
 					new_atom.throw_at(picked_point, distance + 4, 2)
+				currently_sending = FALSE
 
 			. = TRUE
 		if("loan")

code/modules/clothing/spacesuits/_spacesuits.dm

@@ -57,6 +57,7 @@
 	equip_delay_other = 80
 	resistance_flags = NONE
 	actions_types = list(/datum/action/item_action/toggle_spacesuit)
+	clothing_traits = list(LIQUID_PROTECTION)
 	var/temperature_setting = BODYTEMP_NORMAL /// The default temperature setting
 	var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high /// If this is a path, this gets created as an object in Initialize.
 	var/cell_cover_open = FALSE /// Status of the cell cover on the suit

code/modules/clothing/under/jobs/civilian/clown_mime.dm

@@ -37,6 +37,11 @@
 	. = ..()
 	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50, falloff_exponent = 20) //die off quick please
 	AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0)
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/item/clothing/under/rank/civilian/clown/LateInitialize()
+	. = ..()
+	AddComponent(/datum/component/hide_from_people/clown)
 
 /obj/item/clothing/under/rank/civilian/clown/blue
 	name = "blue clown suit"

code/modules/lighting/lighting_object.dm

@@ -39,10 +39,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z)
 	for(var/turf/open/space/space_tile in RANGE_TURFS(1, affected_turf))
 		space_tile.enable_starlight()
 
-	for(var/turf/open/floor/plating/ocean/space_tile in RANGE_TURFS(1, affected_turf))
-		if(space_tile.has_starlight)
-			space_tile.enable_starlight()
-
 	needs_update = TRUE
 	SSlighting.objects_queue += src
 

code/modules/mob/mob_movement.dm

@@ -79,7 +79,7 @@
 	if(mob.control_object)
 		return Move_object(direct)
 	if(!isliving(mob))
-		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct)
+		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct, new_loc)
 		return mob.Move(new_loc, direct)
 	if(mob.stat == DEAD)
 		mob.ghostize()
@@ -156,7 +156,7 @@
 		// At this point we've moved the client's attached mob. This is one of the only ways to guess that a move was done
 		// as a result of player input and not because they were pulled or any other magic.
 		SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVED, direct, old_dir)
-		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct)
+		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct, new_loc)
 
 	var/atom/movable/P = mob.pulling
 	if(P && !ismob(P) && P.density)

monkestation/code/datums/quirks/neutral_quirks.dm

@@ -26,7 +26,7 @@
 		/obj/item/organ/external/anime_bottom,
 		)
 
-/datum/quirk/anime/add(client/client_source)
+/datum/quirk/anime/post_add()
 	. = ..()
 	var/mob/living/carbon/human/human_holder = quirk_holder
 	var/datum/species/species = human_holder.dna.species
@@ -50,3 +50,36 @@
 /datum/quirk/anime/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species)
 	for(var/obj/item/organ/external/organ_path as anything in anime_list)
 		new_species.external_organs |= organ_path
+
+
+/datum/quirk/clown_disbelief
+	name = "Clown Disbelief"
+	desc = "You never really believed in clowns."
+	mob_trait = TRAIT_HIDDEN_CLOWN
+	value = 0
+	icon = "fa-hippo"
+
+/datum/quirk/clown_disbelief/add(client/client_source)
+	. = ..()
+	if(!quirk_holder)
+		return
+	RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(enable))
+	RegisterSignal(quirk_holder, COMSIG_MOB_LOGOUT, PROC_REF(disable))
+	RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(examined))
+
+/datum/quirk/clown_disbelief/remove()
+	. = ..()
+	disable()
+	UnregisterSignal(quirk_holder, COMSIG_MOB_LOGOUT, COMSIG_MOB_LOGIN, COMSIG_PARENT_EXAMINE_MORE)
+
+/datum/quirk/clown_disbelief/proc/examined(datum/source, mob/user, list/examine_list)
+	if(user.mind?.assigned_role.type == /datum/job/clown)
+		examine_list += "[span_warning("[quirk_holder] doesn't seem to notice you!")]\n"
+
+/datum/quirk/clown_disbelief/proc/enable(datum/source)
+	for(var/image/image as anything in GLOB.hidden_image_holders["clown"])
+		quirk_holder.client.images += image
+
+/datum/quirk/clown_disbelief/proc/disable(datum/source)
+	for(var/image/image as anything in GLOB.hidden_image_holders["clown"])
+		quirk_holder.client.images -= image