Merge branch 'TauCetiStation:master' into master

code/__DEFINES/misc.dm

@@ -284,6 +284,8 @@
 #define REGION_COMMAND		7
 #define REGION_CENTCOMM		8
 
+// be wary this adds little overhead with additional proc calls
+// consider modifying existing atom_init/Destroy for atoms with numerous instances
 #define ADD_TO_GLOBAL_LIST(type, list) ##type/atom_init(){\
 	. = ..();\
 	global.##list += src;}\

code/_globalvars/lists/objects.dm

@@ -71,6 +71,7 @@ var/global/list/all_supply_pack = list()
 var/global/list/all_command_microphones = list()
 var/global/list/global_objectives = list() //objectives that need to be completed by several factions or roles
 var/global/list/air_alarms = list()
+var/global/list/pluvian_wisps = list()
 
 var/global/list/spells_by_aspects = list()
 var/global/list/rites_by_aspects = list()

code/controllers/subsystem/samosbor.dm

@@ -8,15 +8,18 @@ SUBSYSTEM_DEF(samosbor)
 
 	var/next_milestone = 10 // players online when we send the next notification
 	var/milestone_step = 10
+	var/bridge_announce_milestone = 30
 
 	var/day
+	var/day_shift = 4 HOURS // starts day at 4 am
+
 	var/notfication_timer
 
 /datum/controller/subsystem/samosbor/Initialize()
 	if(!config.chat_bridge)
 		return ..()
 
-	day = time2text(world.realtime, "YYYY_MM_DD")
+	day = time2text(world.realtime - day_shift, "YYYY_MM_DD")
 
 	var/cache_path = SAMOSBOR_CACHE_PATH(day)
 	if(fexists(cache_path))
@@ -50,8 +53,11 @@ SUBSYSTEM_DEF(samosbor)
 	notfication_timer = addtimer(CALLBACK(src, PROC_REF(milestone_notification), current_milestone), 30 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
 
 /datum/controller/subsystem/samosbor/proc/milestone_notification(milestone)
+	var/list/bridge_type = list(BRIDGE_SAMOSBOR)
+	if(milestone >= bridge_announce_milestone)
+		bridge_type += BRIDGE_ANNOUNCE
 	world.send2bridge(
-		type = list(BRIDGE_ANNOUNCE, BRIDGE_SAMOSBOR),
+		type = bridge_type,
 		attachment_title = "Новый результат на сегодня: более [milestone] игроков онлайн!",
 		attachment_msg = BRIDGE_JOIN_LINKS
 	)

code/datums/cob_highlight.dm

@@ -9,7 +9,7 @@
 	var/obj/item/stack/using_this = null
 	var/turf/over_this = null
 	var/busy = FALSE
-	var/build_direction = NORTH
+	var/build_direction = SOUTH
 	var/image/b_overlay = null
 	var/obj/effect/holo_build = null
 

code/game/objects/effects/decals/contraband.dm

@@ -170,9 +170,9 @@
 	random_basetype = /obj/structure/sign/poster
 
 /obj/structure/sign/poster/calendar
-	name = "2224 calendar"
+	name = "2225 calendar"
 	icon_state = "calendar"
-	desc = "Brand new calendar for year 2224."
+	desc = "Brand new calendar for year 2225."
 
 /obj/structure/sign/poster/sivtsev
 	name = "sivtsev table"

code/game/objects/items/decorations.dm

@@ -6,26 +6,46 @@
 
 	var/obj/item/weapon/pen/holded
 
+/obj/item/pen_holder/atom_init(mapload)
+	. = ..()
+
+	if(mapload)
+		var/turf/T = get_turf(src)
+		var/obj/item/weapon/pen/Pen = locate() in T.contents
+		if(Pen)
+			Pen.forceMove(src)
+			holded = Pen
+
+			update_icon()
+
 /obj/item/pen_holder/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/pen) && !holded)
 		user.drop_from_inventory(I, src)
 		holded = I
-		holded.pixel_x = -2
-		holded.pixel_y = 5
-		underlays += holded
-		icon_state = "penholder_full"
+
+		update_icon()
 
 /obj/item/pen_holder/attack_hand(mob/user)
 	if(holded)
-		underlays = null
 		holded.pixel_x = 0
 		holded.pixel_y = 0
 		user.put_in_active_hand(holded)
 		holded = null
-		icon_state = "penholder"
+
+		update_icon()
 	else
 		..()
 
+/obj/item/pen_holder/update_icon()
+	underlays = null
+	icon_state = "penholder"
+
+	if(holded)
+		icon_state = "penholder_full"
+		holded.pixel_x = -2
+		holded.pixel_y = 5
+		underlays += holded
+
 /obj/item/pens_bin
 	name = "pens bin"
 	desc = "Органайзер для ручек."
@@ -65,6 +85,8 @@
 		var/obj/item/weapon/pen/selection = show_radial_menu(user, src, pens, require_near = TRUE, tooltips = TRUE)
 
 		if(selection)
+			selection.pixel_x = 0
+			selection.pixel_y = 0
 			if(ishuman(user))
 				user.put_in_hands(selection)
 			else

code/game/objects/items/devices/scanners/occult_pinpointer.dm

@@ -42,12 +42,8 @@
 /obj/item/weapon/occult_pinpointer/process()
 	if(!active)
 		return
-	if(!target)
-		var/list/wisp_list = list()
-		for(var/mob/living/simple_animal/ancestor_wisp/W in living_list)
-			wisp_list += W
-		target = pick(wisp_list)
-		message_admins("[target]")
+	if(!target && length(pluvian_wisps))
+		target = pick(pluvian_wisps)
 	if(!target)
 		target = locate(target_type)
 	if(!target)

code/modules/paperwork/folders.dm

@@ -118,8 +118,8 @@
 	. = ..()
 	if(mapload)
 		var/atom/A = get_turf(src)
-		for(var/obj/item/weapon/folder in A.contents)
-			folder.forceMove(src)
+		for(var/obj/item/weapon/folder/Folder in A.contents)
+			Folder.forceMove(src)
 		update_icon()
 
 /obj/item/folder_holder/update_icon()

code/modules/religion/pluvia_heaven.dm

@@ -215,6 +215,7 @@
 	if(istype(I,/obj/item/weapon/melee/pluvia_gong_baton))
 		ring(user)
 
+ADD_TO_GLOBAL_LIST(/mob/living/simple_animal/ancestor_wisp, pluvian_wisps)
 /mob/living/simple_animal/ancestor_wisp
 	name = "Wisp"
 	real_name = "Wisp"