missing apoc types (real this time) by dwinters99 · Pull Request #531 · DarkPack13/SecondCity

dwinters99 · 2026-01-16T11:28:53Z

About The Pull Request

wolves: mundane, kinfolk, spiral edit: new deadsprites by @Major00

psg1 fixes

Why It's Good For The Game

Changelog

🆑 dwinters99, KCartridge, Major00
add: DP Wolves
add: PSG1 magazine and ammo
code: gun code organization
add: undense bin
/:cl:

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

@Major00

Co-authored-by: @Major00

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

FalloutFalcon

nits:

…o new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>

…types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

FalloutFalcon

approved but also i made alot of changes to the pr myself so need someone else to skim it.

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

chazzyjazzy · 2026-01-30T08:12:30Z


+// DARKPACK EDIT ADD START - NPC - (snowflake obeys_commands abstraction proc)
+/mob/living/basic/pet/dog/proc/add_obey_commands()
+	var/static/list/pet_commands = list( // DARKPACK EDIT REMOVE START - npc - Moving this into a proc so we can have subtypes with different commands


this comment matches the one on line 39 even though it does not remove here

chazzyjazzy · 2026-01-30T08:18:52Z

+#define COAT_BLACK 1 // wolf1
+#define COAT_GRAY 2 // wolf2
+#define COAT_RED 3 // wolf3
+#define COAT_WHITE 4 // wolf4
+#define COAT_GINGER 5 // wolf5
+#define COAT_BROWN 6 // wolf6
+
+#define TYPE_MUNDANE "wolf"
+#define TYPE_KINFOLK "kinfolk"
+#define TYPE_SPIRAL "spiral"


maybe a defines folder for WTA content? just so we keep a standard?

or just, defines in the folders we've been using, idk, up to you

The coat colors could be moved i guess but the "type" thing is snowflake for the wolves

chazzyjazzy · 2026-01-30T08:20:32Z

+	maxHealth = 120
+	health = 120
+	obj_damage = 15
+	melee_damage_lower = 7.5
+	melee_damage_upper = 7.5
+	attack_vis_effect = ATTACK_EFFECT_BITE
+	melee_attack_cooldown = 1.2 SECONDS


something makes me wanna say, make these all more favorable for the wolf lol. I mean, its a WOLF!

Not opposed to this tho, it is, after all, an npc critter

chazzyjazzy · 2026-01-30T08:40:16Z

+#TFN removed atmos. We have not
+/obj/item/anesthetic_tank : /obj/item/tank/internals/anesthetic {@OLD}
+


we wont be removing it on darkpack ive heard

i believe this comment is in reference to oldcode removing atmos and therefore needing weird new items like this that now need to be turned back into atmos items (@FalloutFalcon)

chazzyjazzy · 2026-01-30T08:40:40Z

+# Apoc subtyped them under masq contracts. We didnt but honestly consider.
+/obj/item/masquerade_contract/veil : /obj/item/veil_contract {@OLD}


chazzyjazzy · 2026-01-30T08:42:22Z

+#this assumes all old mapped "wolfkin" are infact kinfolk
+/mob/living/basic/pet/dog/wolfkin : /mob/living/basic/pet/dog/wolf/kinfolk {@OLD}
+/mob/living/basic/pet/dog/wolfkin/@SUBTYPES : /mob/living/basic/pet/dog/wolf/kinfolk/@SUBTYPES {@OLD}


A safe assumption, im just wondering if all wolfkin mobs prior were mob/living/basic since I seem to remember a long time ago that they may have been simplemobs

not a big deal at all tho itll just mean more of a headache for anyone who wants to bring back the OLD map, like the wod13 map, lol, which likely won't happen.

I think this is an oversight on either my part or @FalloutFalcon's part. they were 100% simple_mobs.

Yea oversight. (the simple mob type only exists on apoc, they are evil varedits elsewhere)

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

KCartridge and others added 2 commits January 16, 2026 01:11

The mess

41c0490

terrorism snowflake

df12072

github-actions Bot added Sprites Feature labels Jan 16, 2026

dwinters99 added 4 commits January 16, 2026 07:55

7.62 NATO and gun file organization (still need some sprites)

97457c4

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

1952fd2

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

psg1 onfloors

320b39a

Merge branch 'new-apoc-missing-types-pr-because-i-wanted-to-wait-for-…

c2ce9d2

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

github-actions Bot added the Code Improvement label Jan 16, 2026

dwinters99 added 6 commits January 16, 2026 08:13

undense bin

bfa9916

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

58b5531

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

braaaah

a4296b8

Merge branch 'new-apoc-missing-types-pr-because-i-wanted-to-wait-for-…

4a1858f

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

better wolf deadsprites

0b65a7d

Co-authored-by: @Major00

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

bb98cc6

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

FalloutFalcon reviewed Jan 20, 2026

View reviewed changes

Comment thread modular_darkpack/modules/npc/code/nonhuman/friendly/wolf.dm Outdated

Comment thread code/modules/mob/living/basic/pets/dog/_dog.dm Outdated

Comment thread code/modules/mob/living/basic/pets/dog/_dog.dm Outdated

FalloutFalcon added 2 commits January 20, 2026 17:46

fixes

2f698e1

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

4cebd86

…o new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

github-actions Bot added the Tools label Jan 20, 2026

FalloutFalcon and others added 9 commits January 20, 2026 18:25

minor spelling mistake, compile fix, wolf updatepats

d2f5d90

this should be a switch....

b78a364

updates path for missed rune.

7a67816

more

6f22698

dogs

997da0c

Merge branch 'new-apoc-missing-types-pr-because-i-wanted-to-wait-for-…

373da98

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

Update code/modules/mob/living/basic/pets/dog/_dog.dm

5e99eaf

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>

Update code/modules/mob/living/basic/pets/dog/_dog.dm

88654fc

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>

Update modular_darkpack/modules/npc/code/nonhuman/friendly/wolf.dm

4abfcb5

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>

github-actions Bot added the Merge Conflict label Jan 23, 2026

Merge remote-tracking branch 'upstream/master' into new-apoc-missing-…

d03a711

…types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

.75

f8d77c4

github-actions Bot removed the Merge Conflict label Jan 27, 2026

dwinters99 added 3 commits January 26, 2026 22:16

fixing the flavgun pr slightly

8b0f174

ok fine dude oops

c9b1b23

ok yeah

e60d5ce

dwinters99 marked this pull request as ready for review January 27, 2026 03:43

dwinters99 requested review from a team as code owners January 27, 2026 03:43

dwinters99 added 2 commits January 27, 2026 15:02

ok fine bro?? i'm desperate

87edc06

sure enough

27f6df5

FalloutFalcon approved these changes Jan 29, 2026

View reviewed changes

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

508d71a

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

chazzyjazzy requested changes Jan 30, 2026

View reviewed changes

dwinters99 and others added 7 commits January 30, 2026 17:32

Update modular_darkpack/modules/npc/code/nonhuman/friendly/wolf.dm

62eecd0

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

4534244

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

Update modular_darkpack/modules/weapons/code/guns.dm

7f5ab57

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>

Update modular_darkpack/modules/weapons/code/guns.dm

3305211

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

135a9f5

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

fix

70ad569

Merge branch 'new-apoc-missing-types-pr-because-i-wanted-to-wait-for-…

58be765

…the-tfn-one-so-i-gave-up-on-the-last-one' of https://github.com/dwinters99/SecondCity into new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

FalloutFalcon requested a review from chazzyjazzy February 6, 2026 22:45

FalloutFalcon and others added 2 commits February 6, 2026 16:47

this as well

d83b867

Merge branch 'master' into new-apoc-missing-types-pr-because-i-wanted…

13e535f

…-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one

chazzyjazzy approved these changes Feb 9, 2026

View reviewed changes

XeonMations added this pull request to the merge queue Feb 9, 2026

Merged via the queue into DarkPack13:master with commit 415d933 Feb 9, 2026
21 checks passed

darkpack13-api Bot added a commit that referenced this pull request Feb 9, 2026

Automatic changelog for PR #531 [ci skip]

3ec853f

github-actions Bot added a commit that referenced this pull request Feb 9, 2026

Updating GBP balances for #531

6f5c4e7

dwinters99 deleted the new-apoc-missing-types-pr-because-i-wanted-to-wait-for-the-tfn-one-so-i-gave-up-on-the-last-one branch March 22, 2026 20:11

		#TFN removed atmos. We have not
		/obj/item/anesthetic_tank : /obj/item/tank/internals/anesthetic {@OLD}

		# Apoc subtyped them under masq contracts. We didnt but honestly consider.
		/obj/item/masquerade_contract/veil : /obj/item/veil_contract {@OLD}

Conversation

dwinters99 commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About The Pull Request

Why It's Good For The Game

Changelog

Uh oh!

FalloutFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FalloutFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chazzyjazzy Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FalloutFalcon Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dwinters99 commented Jan 16, 2026 •

edited

Loading

chazzyjazzy Jan 30, 2026 •

edited

Loading

FalloutFalcon Feb 1, 2026 •

edited

Loading