[TM ONLY] Puptime test merge 4

.github/CODEOWNERS

@@ -5,18 +5,26 @@
 # to the same file or dir, add them to the end of under Multiple Owners
 
 # Map Maintainers
+/_maps/ @DarkPack13/maptainers
+*.dmm @DarkPack13/maptainers
 
 # Sprite Maintainers
-/icons/ @ApocryphaXIII/spritetainers
-*.dmi @ApocryphaXIII/spritetainers
+/icons/ @DarkPack13/spritetainers
+*.dmi @DarkPack13/spritetainers
 
 # Code Maintainers
-/code/ @ApocryphaXIII/maintainers
-*.dm @ApocryphaXIII/maintainers
+/code/ @DarkPack13/maintainers
+*.dm @DarkPack13/maintainers
 
 # MAINTAINERS
 
 # FalloutFalcon
+/modular_darkpack/modules/cars/code/ @FalloutFalcon
+/modular_darkpack/modules/city_time/code/ @FalloutFalcon
+/modular_darkpack/modules/doors/code/vampdoor.dm @FalloutFalcon
+
+# XeonMations
+/modular_darkpack/modules/masquerade/code/ @XeonMations
 
 # CONTRIBUTORS
 

.github/workflows/run_linters.yml

@@ -66,7 +66,6 @@ jobs:
         run: |
           bash tools/ci/check_grep.sh
           bash modular_darkpack/tools/darkpack_check_grep.sh # DARKPACK EDIT ADDITION - checking modular_darkpack code
-          bash modular_zapoc/tools/apoc_check_grep.sh # APOC EDIT ADD
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |

README.md

@@ -1,14 +1,14 @@
-## The Apocrypha codebase
+## The Second City codebase
 
 [![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
-| Website                 | Link                                         |
-| ----------------------- | -------------------------------------------- |
-| Code                    | https://github.com/ApocryphaXIII/Apocrypha13 |
-| The Second City Discord | https://discord.gg/rmAbJcuChD                |
-| Coderbus Discord        | https://discord.gg/Vh8TJp9                   |
+| Website                 | Link                                     |
+| ----------------------- | -----------------------------------------|
+| Code                    | https://github.com/DarkPack13/SecondCity |
+| The Second City Discord | https://discord.gg/rmAbJcuChD            |
+| Coderbus Discord        | https://discord.gg/Vh8TJp9               |
 
-This is the codebase for Apocrypha13, a downstream/fork for the Darkpack13 Project, a fork of TGstation 2025
+This is the codebase for the Darkpack13 Project, a fork of TGstation 2025 for the purposes of being an upstream for The Final Nights, Apocrypha, Requiem and World of Darkness 13.
 
 We are based on the Paradox Interactive World of Darkness(c) gamelines, with administrative oversight determining what we add to our game.
 

_maps/gateway_test.json

@@ -1,4 +1,5 @@
 {
+	"exclude_from_ci": true,
 	"version": 1,
 	"map_name": "Gateway Test",
 	"map_path": "map_files/debug",

_maps/map_files/Vampire/admin_central.dmm

@@ -11710,10 +11710,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/admin/storage,
 /turf/open/floor/iron,
 /area/centcom/central_command_areas/supply)
-"ZZ" = (
-/obj/transfer_point_vamp/backrooms/map,
-/turf/open/floor/carpet,
-/area/awaymission/errorroom)
 
 (1,1,1) = {"
 TJ
@@ -14683,7 +14679,7 @@ aa
 LW
 ik
 LV
-ZZ
+LV
 LV
 LV
 LV

_maps/map_files/Vampire/westfield_mall/westfield_mall.dmm

@@ -14060,10 +14060,6 @@
 /obj/effect/landmark/navigate_destination,
 /turf/open/floor/wood/smooth,
 /area/vtm/westfield_mall/interior/candy_store)
-"aUv" = (
-/obj/transfer_point_vamp/backrooms/map,
-/turf/open/openspace,
-/area/vtm/westfield_mall)
 "aUw" = (
 /obj/item/instrument/eguitar/vamp{
 	pixel_y = -10;
@@ -101556,7 +101552,7 @@ ahY
 ahY
 ahY
 ahY
-aUv
+ahY
 ahY
 ahY
 ahY

_maps/runtimestation.json

@@ -1,5 +1,6 @@
 {
 	"version": 1,
+	"exclude_from_ci": true,
 	"map_name": "Runtime Station",
 	"map_path": "map_files/debug",
 	"map_file": "runtimestation.dmm",

_maps/runtimestation_minimal.json

@@ -1,5 +1,6 @@
 {
 	"version": 1,
+	"exclude_from_ci": true,
 	"map_name": "Minimal Runtime Station",
 	"map_path": "map_files/debug",
 	"map_file": "runtimestation_minimal.dmm",

_maps/westfieldmall.json

@@ -1,4 +1,5 @@
 {
+	"exclude_from_ci": true,
 	"version": 1,
 	"map_name": "Westfield Mall",
 	"map_path": "map_files/Vampire/westfield_mall",

code/__DEFINES/~darkpack/branding.dm

@@ -5,21 +5,22 @@
 
 #define SEPT_NAME "Sept of the Western Eye"
 
-#define EVIL_COMPANY "Pentex"
+#define EVIL_COMPANY "Pentex Group"
 
 #define MAIN_EVIL_COMPANY EVIL_OIL_COMPANY // Only effects Pentex job slots
 
 // Treated as subsidary of EVIL_COMPANY
 /* MAJOR COMPANIES - Currently or at one time held the Top 21 Company title */
 #define EVIL_TRASH_COMPANY "Ardus Enterprises"
-#define EVIL_TOY_COMPANY "Avalon Incorporated."
+#define EVIL_TOY_COMPANY "Avalon Incorporated"
 #define EVIL_CIGARETTE_COMPANY "Circinus Brands"
 #define EVIL_INVESTMENT_COMPANY "Consolidex Worldwide"
 #define EVIL_OIL_COMPANY "Endron International"
 #define EVIL_NUCLEAR_COMPANY "Atlas International" // Subsidiary of Endron
 #define EVIL_MINING_COMPANY "Harold and Harold Mining, Incorporated"
 #define EVIL_PAPER_COMPANY "Good House International"
 #define EVIL_FISHING_COMPANY "Hallahan Fishing Company"
+#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
 #define EVIL_GROCERY_COMPANY "Herrick's"
 #define EVIL_LIQUOR_COMPANY "King Breweries and Distilleries"
 #define EVIL_PHARMA_COMPANY "Magadon, Incorporated"
@@ -41,7 +42,7 @@
 #define EVIL_EGYPTIAN_OIL_COMPANY "EGPC"
 
 /* HAROLD AND HAROLD SUBSIDIARIES */
-#define EVIL_EGYPTIAN_MINING_COMPANY "Kaulet Mining"
+#define EVIL_EGYPTIAN_MINING_COMPANY "Kauket Mining"
 
 /* KING BREWERIES SUBSIDIARIES */
 #define EVIL_WATERWAY_COMPANY "AquaClear Foundation"
@@ -82,13 +83,12 @@
 #define EVIL_COSMETICS_COMPANY_3 "Pangloss Cosmetics" // Subsidiary of Siren Cosmetics
 #define EVIL_WEAPON_COMPANY "Full Force Solutions"
 #define EVIL_PR_COMPANY "Gaia Research Company"
-#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
 #define EVIL_CONSTRUCTION_COMPANY "Hi-Quality Builders"
 #define EVIL_LAW_COMPANY "Meyers, Feinstein and Hargrett"
 #define EVIL_TECH_COMPANY "NikNak Computing"
 #define EVIL_GAMING_COMPANY "Deep Dive Games" // Subsidiary of NikNak
 #define EVIL_NEWS_COMPANY "RED Network"
-#define EVIL_CONTSTRUCTION_COMPANY_2 "Safe Haven Construction"
+#define EVIL_CONSTRUCTION_COMPANY_2 "Safe Haven Construction"
 #define EVIL_INTEL_COMPANY "Shade, Inc."
 #define EVIL_HORROR_COMPANY "Slaughterhouse Video"
 #define EVIL_CONSULTING_COMPANY "Southeastern Tech Management"

code/__DEFINES/~darkpack/colors.dm

@@ -1 +1,22 @@
-#define COLOR_ENDRON_GREEN "#015334"
+#define COLOR_CORP_PENTEX "#3B2033"
+
+#define COLOR_CORP_ARDUS "#9BADB7"
+#define COLOR_CORP_AVALON "#6556ED"
+#define COLOR_CORP_CIRCINUS "#FFBF82"
+#define COLOR_CORP_CONSOLIDEX "#DD28FF"
+#define COLOR_CORP_ENDRON "#015334"
+#define COLOR_CORP_HAROLD_HAROLD "#92483B"
+#define COLOR_CORP_GOOD_HOUSE "#B297BB"
+#define COLOR_CORP_HALLAHAN "#460DD1"
+#define COLOR_CORP_HERCULEAN "#FF1010"
+#define COLOR_CORP_HERRICKS "#9009BB"
+#define COLOR_CORP_KING "#CDAF58"
+#define COLOR_CORP_MAGADON "#45F7FF"
+#define COLOR_CORP_NASTRUM "#FF7DA2"
+#define COLOR_CORP_OMNI_TV "#ED795E"
+#define COLOR_CORP_OTOLLEYS "#8FEDC5"
+#define COLOR_CORP_BLACK_DOG "#E3EBFF"
+#define COLOR_CORP_RAINBOW_INC "#FFB6EE"
+#define COLOR_CORP_TELLUS "#66FF28"
+#define COLOR_CORP_VESUVIUS "#E7E8C7"
+#define COLOR_CORP_YOUNG_SMITH "#A5BB97"

code/__HELPERS/icons.dm

@@ -566,7 +566,8 @@ world
 
 		if(no_anim)
 			//Clean up repeated frames
-			var/icon/cleaned = new /icon()
+			// Done this way otherwise Width() and Height() would always be 0 for this icon // DARKPACK EDIT ADD START - Company Logos
+			var/icon/cleaned = icon('icons/effects/effects.dmi', "nothing") // DARKPACK EDIT ADD END
 			cleaned.Insert(flat, "", SOUTH, 1, 0)
 			return cleaned
 		else

code/_onclick/hud/new_player.dm

@@ -29,7 +29,7 @@
 			lobbyscreen.RegisterSignal(src, COMSIG_HUD_LOBBY_COLLAPSED, TYPE_PROC_REF(/atom/movable/screen/lobby, collapse_button))
 			lobbyscreen.RegisterSignal(src, COMSIG_HUD_LOBBY_EXPANDED, TYPE_PROC_REF(/atom/movable/screen/lobby, expand_button))
 
-	if (!owner.client.is_localhost())
+	if (!owner?.client?.is_localhost()) // DARKPACK EDIT, ORIGINAL: if (!owner.client.is_localhost())
 		return
 
 	var/atom/movable/screen/lobby/button/start_now/start_button = new(our_hud = src)

code/game/objects/items/skub.dm

@@ -6,6 +6,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb_continuous = list("skubs")
 	attack_verb_simple = list("skub")
+	brand = "badcode" // DARKPACK EDIT ADD - COMPANY_LOGOS - Proof of concept. I kinda like it. Leave it?
 
 /obj/item/skub/Initialize(mapload)
 	. = ..()

code/game/objects/structures/platform.dm

@@ -7,7 +7,8 @@
 	icon = 'icons/obj/smooth_structures/platform/window_frame_normal.dmi'
 	icon_state = "window_frame_normal-0"
 	base_icon_state = "window_frame_normal"
-	layer = PLATFORM_LAYER // DARKPACK EDIT ADD - (Allows tables to be placed ontop of platforms (but please dont))
+	layer = CLOSED_TURF_LAYER // DARKPACK EDIT ADD - (Allows tables to be placed ontop of platforms (but please dont))
+	plane = WALL_PLANE // DARKPACK EDIT ADD
 	smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
 	smoothing_groups = SMOOTH_GROUP_PLATFORMS
 	canSmoothWith = SMOOTH_GROUP_PLATFORMS

code/game/objects/structures/shower.dm

@@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(shower_mode_descriptions, list(
 	///How much reagent capacity should the shower begin with when built.
 	var/reagent_capacity = 200
 	///How many units the shower refills every second.
-	var/refill_rate = 0.5
+	var/refill_rate = 50 // DARKPACK EDIT, ORIGINAL: var/reclaim_rate = 0.5
 	///Does the shower have a water recycler to recollect its water supply?
 	var/has_water_reclaimer = TRUE
 	///Which mode the shower is operating in.
@@ -87,7 +87,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
 	if(src.has_water_reclaimer)
 		reagents.add_reagent(reagent_id, reagent_capacity)
 	soundloop = new(src, FALSE)
-	AddComponent(/datum/component/plumbing/simple_demand/extended)
+	// AddComponent(/datum/component/plumbing/simple_demand/extended) // DARKPACK EDIT REMOVAL
 	var/static/list/loc_connections = list(
 		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
 		COMSIG_ATOM_EXITED = PROC_REF(on_exited),

code/game/objects/structures/water_structures/sink.dm

@@ -19,7 +19,7 @@
 	///Does the sink have a water recycler to recollect its water supply?
 	var/has_water_reclaimer = TRUE
 	///Units of water to reclaim per second
-	var/reclaim_rate = 0.5
+	var/reclaim_rate = 50 // DARKPACK EDIT, ORIGINAL: var/reclaim_rate = 0.5
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
 
@@ -29,7 +29,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
 	create_reagents(capacity, NO_REACT)
 	if(has_water_reclaimer)
 		reagents.add_reagent(dispensedreagent, capacity)
-	AddComponent(/datum/component/plumbing/simple_demand/extended)
+	// AddComponent(/datum/component/plumbing/simple_demand/extended) // DARKPACK EDIT REMOVAL
 
 	register_context()
 

code/game/objects/structures/water_structures/toilet.dm

@@ -25,7 +25,7 @@
 	/// Does the toilet have a water recycler to recollect its water supply?
 	var/has_water_reclaimer = TRUE
 	/// Units of water to reclaim per second
-	var/reclaim_rate = 0.5
+	var/reclaim_rate = 50 // DARKPACK EDIT, ORIGINAL: var/reclaim_rate = 0.5
 	/// What reagent does the toilet flush with
 	var/reagent_id = /datum/reagent/water
 	/// How much reagent can the cistern contain
@@ -46,7 +46,7 @@
 	create_reagents(reagent_capacity)
 	if(src.has_water_reclaimer)
 		reagents.add_reagent(reagent_id, reagent_capacity)
-	AddComponent(/datum/component/plumbing/simple_demand/extended)
+	// AddComponent(/datum/component/plumbing/simple_demand/extended) // DARKPACK EDIT REMOVAL
 
 /obj/structure/toilet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
 	. = ..()

code/modules/mob/living/carbon/human/emote.dm

@@ -20,7 +20,7 @@
 
 /datum/emote/living/carbon/human/glasses/can_run_emote(mob/user, status_check = TRUE, intentional, params)
 	var/obj/eyes_slot = user.get_item_by_slot(ITEM_SLOT_EYES)
-	if(istype(eyes_slot, /obj/item/clothing/glasses/regular) || istype(eyes_slot, /obj/item/clothing/glasses/sunglasses))
+	if(istype(eyes_slot, /obj/item/clothing/glasses) || istype(eyes_slot, /obj/item/clothing/glasses/sunglasses)) // DARKPACK EDIT CHANGE - Original :  if(istype(eyes_slot, /obj/item/clothing/glasses/regular) || istype(eyes_slot, /obj/item/clothing/glasses/sunglasses))
 		return ..()
 	return FALSE
 

code/modules/mob/mob.dm

@@ -292,7 +292,7 @@
 	var/raw_msg = message
 	var/space = should_have_space_before_emote(html_decode(message)[1]) ? " " : "" // DARKPACK EDIT ADD
 	if(visible_message_flags & WITH_EMPHASIS_MESSAGE)
-		message = apply_message_emphasis(message)
+		raw_msg = apply_message_emphasis(message) // DARKPACK EDIT, ORIGINAL: message = apply_message_emphasis(message)
 	/* // DARKPACK EDIT REMOVAL START
 	if(visible_message_flags & EMOTE_MESSAGE)
 		message = span_emote("<b>[src]</b> [message]")
@@ -306,7 +306,7 @@
 
 		// DARKPACK EDIT ADDITION START
 		if(visible_message_flags & EMOTE_MESSAGE)
-			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][message]")
+			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][raw_msg]")
 		// DARKPACK EDIT ADDITION END
 
 		//This entire if/else chain could be in two lines but isn't for readibilties sake.
@@ -371,7 +371,7 @@
 	var/raw_msg = message
 	var/space = should_have_space_before_emote(html_decode(message)[1]) ? " " : "" // DARKPACK EDIT ADD
 	if(audible_message_flags & WITH_EMPHASIS_MESSAGE)
-		message = apply_message_emphasis(message)
+		raw_msg = apply_message_emphasis(message) // DARKPACK EDIT, ORIGINAL: message = apply_message_emphasis(message)
 	/* // DARKPACK EDIT REMOVAL START
 	if(audible_message_flags & EMOTE_MESSAGE)
 		message = span_emote("<b>[src]</b> [message]")
@@ -383,7 +383,7 @@
 			continue
 		// DARKPACK EDIT ADDITION START
 		if(audible_message_flags & EMOTE_MESSAGE)
-			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][message]")
+			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][raw_msg]")
 		// DARKPACK EDIT ADDITION END
 		if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(hearing_mob, audible_message_flags) && !HAS_TRAIT(hearing_mob, TRAIT_DEAF))
 			hearing_mob.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags)

html/changelogs/AutoChangeLog-pr-854.yml

@@ -0,0 +1,4 @@
+author: "Enbyy"
+delete-after: True
+changes:
+  - bugfix: "Fixed Sabbat not having debit cards on spawn."

html/changelogs/AutoChangeLog-pr-906.yml

@@ -0,0 +1,4 @@
+author: "dwinters99"
+delete-after: True
+changes:
+  - map: "removed 50% of exits from the Backrooms"

modular_darkpack/master_files/code/game/objects/objs.dm

@@ -0,0 +1,9 @@
+/obj
+	// DARKPACK Module - COMPANY_LOGOS - If matching a /datum/brand's manufacturer, append a logo to the examine text. Element only added by default on /obj/
+	var/brand
+
+
+/obj/Initialize(mapload)
+	. = ..()
+	if(brand) // DARKPACK module - COMPANY_LOGOS - If we don't have a brand, disregard.
+		AddElement(/datum/element/corp_label, GLOB.all_brandnames[brand])

modular_darkpack/modules/blood_drinking/code/movable_screens/blood_hud.dm

@@ -1,4 +1,4 @@
-#define UI_LIVING_BLOODPOOL "EAST-2:28,CENTER-4:14"
+#define UI_LIVING_BLOODPOOL "EAST-2:29,CENTER-4:4"
 /atom/movable/screen/bloodpool
 	name = "bloodpool"
 	//icon = 'modular_darkpack/modules/blood_drinking/icons/bloodpool.dmi'