The Monsters Return by dwasint · Pull Request #7085 · Monkestation/Vanderlin

dwasint · 2026-07-06T14:49:18Z

About The Pull Request

Why It's Good For The Game

Changelog

🆑
add: putrid
refactor: orcs and goblins now get their stats applied via their species meaning player controlled ones get stats
add: hell goblins explode
add: moon goblins know how to summon a brick
add; broodmother is now playable in game using the vessel system.
refactor: as per the species doc, adds orcs to the generic human body list, letting them wear clothes.
/:cl:

Pre-Merge Checklist

You tested this on a local server.
This code did not runtime during testing.
You documented all of your changes.

…er den, also broodmother den start.

…ide of this its not really possible without ALOT of fucking

…bs follow through better, fixes virtual paths

…non burn by default

…ins swimmer

…nto the-monsters

CheffieGithub · 2026-07-10T17:44:08Z

 #define HARLEQUINN_VESSEL_ID "Harlequinn"
 #define HARLEQUINN_HUNT_REWARD 500

+#define PUTRID_VESSEL_ID "Putrid"


Make a folder for vessel defines

CheffieGithub · 2026-07-10T17:47:59Z

+	icon_state = "runner"
+	icon_living = "runner"
+	icon_dead = "runner_dead"
+	c


Suggested change

c

CheffieGithub · 2026-07-10T17:48:20Z

-				if(istype(Item, generator_type))
-					continue checking_items
-			Item.try_wrap_up("meat", "meatthings")
+	for(var/obj/item/Item in T.contents)


Suggested change

for(var/obj/item/Item in T.contents)

for(var/obj/item/Item in T)

CheffieGithub · 2026-07-10T17:50:13Z

@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(vessel_ids, list(WHITELIST_AUTOMATON, HARLEQUINN_VESSEL_ID))
+GLOBAL_LIST_INIT(vessel_ids, list(WHITELIST_AUTOMATON, HARLEQUINN_VESSEL_ID,BROODSPAWN_GOBLIN_VESSEL_ID,BROODSPAWN_TROLL_VESSEL_ID,BROODSPAWN_ORC_VESSEL_ID, BROODMOTHER_VESSEL_ID, PUTRID_VESSEL_ID))


Suggested change

GLOBAL_LIST_INIT(vessel_ids, list(WHITELIST_AUTOMATON, HARLEQUINN_VESSEL_ID,BROODSPAWN_GOBLIN_VESSEL_ID,BROODSPAWN_TROLL_VESSEL_ID,BROODSPAWN_ORC_VESSEL_ID, BROODMOTHER_VESSEL_ID, PUTRID_VESSEL_ID))

GLOBAL_LIST_INIT(vessel_ids, list(

WHITELIST_AUTOMATON,

HARLEQUINN_VESSEL_I,

BROODSPAWN_GOBLIN_VESSEL_ID,

BROODSPAWN_TROLL_VESSEL_ID,

BROODSPAWN_ORC_VESSEL_ID,

BROODMOTHER_VESSEL_ID,

PUTRID_VESSEL_ID,

))

Why does automaton not match

CheffieGithub · 2026-07-10T17:54:16Z

+				/datum/pet_command/idle,
+				/datum/pet_command/free,
+				/datum/pet_command/follow,
+				/datum/pet_command/attack,
+				/datum/pet_command/protect_owner,
+				/datum/pet_command/aggressive,
+				/datum/pet_command/calm,
+			)


Suggested change

/datum/pet_command/idle,

/datum/pet_command/free,

/datum/pet_command/follow,

/datum/pet_command/attack,

/datum/pet_command/protect_owner,

/datum/pet_command/aggressive,

/datum/pet_command/calm,

)

/datum/pet_command/idle,

/datum/pet_command/free,

/datum/pet_command/follow,

/datum/pet_command/attack,

/datum/pet_command/protect_owner,

/datum/pet_command/aggressive,

/datum/pet_command/calm,

)

CheffieGithub · 2026-07-10T17:57:33Z

+		if(isliving(target))
+			addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, fly_towards), "is yanked towards [caster] by the harpoon!", caster), pull_delay)
+
+		else
+			addtimer(CALLBACK(caster, TYPE_PROC_REF(/mob, fly_towards), "is yanked forward by the harpoon line!", target), pull_delay)


Suggested change

if(isliving(target))

addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, fly_towards), "is yanked towards [caster] by the harpoon!", caster), pull_delay)

else

addtimer(CALLBACK(caster, TYPE_PROC_REF(/mob, fly_towards), "is yanked forward by the harpoon line!", target), pull_delay)

return

if(isliving(target))

addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, fly_towards), "is yanked towards [caster] by the harpoon!", caster), pull_delay)

else

addtimer(CALLBACK(caster, TYPE_PROC_REF(/mob, fly_towards), "is yanked forward by the harpoon line!", target), pull_delay)

CheffieGithub · 2026-07-10T17:57:41Z

+	damage = 15
+	damage_type = BRUTE
+	speed = 1.6
+	var/mob/living/caster


yummy gc fail

CheffieGithub · 2026-07-10T17:57:51Z

 	icon = 'icons/roguetown/mob/cabbit.dmi'
 	icon_state = "cabbit_remains"
+
+/datum/action/cooldown/spell/harpoon_pull


Why is this not a projectile spell?

CheffieGithub · 2026-07-10T17:58:10Z

+				/datum/pet_command/idle,
+				/datum/pet_command/free,
+				/datum/pet_command/follow,
+				/datum/pet_command/attack,
+				/datum/pet_command/protect_owner,
+				/datum/pet_command/aggressive,
+				/datum/pet_command/calm,
+			)


Suggested change

/datum/pet_command/idle,

/datum/pet_command/free,

/datum/pet_command/follow,

/datum/pet_command/attack,

/datum/pet_command/protect_owner,

/datum/pet_command/aggressive,

/datum/pet_command/calm,

)

/datum/pet_command/idle,

/datum/pet_command/free,

/datum/pet_command/follow,

/datum/pet_command/attack,

/datum/pet_command/protect_owner,

/datum/pet_command/aggressive,

/datum/pet_command/calm,

)

CheffieGithub · 2026-07-10T17:59:35Z

+	var/in_water = istype(current_turf)
+
+	var/mob/living/target
+	if(ai_controller)


Don't do anything unless the ai controller is present or it will force players to submerge + this should be an innate action so players can use it properly

dwasint added 5 commits July 6, 2026 05:48

new base sprites

695e32d

whoops

c34c78c

whoops

02b3a69

corpse feeding now actually works

7d41240

Update find_highest_aggro.dm

98d9ad5

dwasint requested a review from aberrantQuesrist as a code owner July 6, 2026 14:49

github-actions Bot added Feature adds a new thing Sprites This affects the appearance of something in game. Such as an item or a wall. labels Jul 6, 2026

dwasint added 2 commits July 6, 2026 20:55

Merge remote-tracking branch 'upstream/main' into the-monsters

3cd6a67

adds in a brood spawner effect to create the z-link for the broodmoth…

ea9a3b1

…er den, also broodmother den start.

github-actions Bot added the Mapping You changed a map file, thank you for your tiles. May require additional approval. label Jul 7, 2026

github-actions Bot requested a review from MissyNym July 7, 2026 05:47

dwasint added 7 commits July 6, 2026 21:55

adds shake to it, makes it a true mapping helper

a01fc13

adds dist 3d awareness to virtual stacks within 1 (unfortunately outs…

665b841

…ide of this its not really possible without ALOT of fucking

this is infinitely faster

45adec1

virtual-z pathing logic (1 bug)

521a708

makes AI not sleep if they have a living target as a means to make mo…

e47698a

…bs follow through better, fixes virtual paths

adds in the ability to possess all the broodmother types

4179b3f

ui fixes for these two

562b2b3

makes putrid and brood ai never sleep

c648865

VanderlinMonarch mentioned this pull request Jul 8, 2026

Drinking blood does damage through armor. #7132

Open

Update broodmother.dm

c614a09

makes goblins able to wear more clothing options, make violent death …

65870ca

…non burn by default

github-actions Bot added the Code Maintenance Fixing this mess one line at a time label Jul 9, 2026

dwasint added 2 commits July 9, 2026 07:30

Update CentCom.dmm

7b54d0b

adds burn to brute since we null it

3db21d7

This was referenced Jul 9, 2026

[Major] Tattoo armor bug #7144

Open

[Minor] Tomb traps #7145

Open

dwasint added 4 commits July 9, 2026 11:01

adds sea trolls, gives axe trolls an axe slam ability. gives sea gobl…

73b0b59

…ins swimmer

Update troll.dm

49e59b7

fixes trolls being dumb when brooded

4410fe6

Update troll.dm

f7655b2

VanderlinMonarch mentioned this pull request Jul 9, 2026

[Major] Weapons not showing up on exiled warrier merc class #7146

Open

dwasint and others added 8 commits July 9, 2026 11:48

Update broodmother.dm

ea56e53

Merge remote-tracking branch 'upstream/main' into the-monsters

3f2a526

Update broodmother.dm

9de3b36

Merge branch 'main' into the-monsters

44618fd

Merge branch 'main' into the-monsters

6afdf6f

Update CentCom.dmm

752ee7b

Merge branch 'the-monsters' of https://github.com/dwasint/Vanderlin i…

06ba6d6

…nto the-monsters

Update CentCom.dmm

a16c881

dwasint added 2 commits July 10, 2026 08:20

fixed

86a9449

Update violent_death.dm

d4ad16a

CheffieGithub reviewed Jul 10, 2026

View reviewed changes

VanderlinMonarch mentioned this pull request Jul 10, 2026

xddddd #7161

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

The Monsters Return#7085

The Monsters Return#7085
dwasint wants to merge 39 commits into
Monkestation:mainfrom
dwasint:the-monsters

dwasint commented Jul 6, 2026 •

edited

Loading

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

CheffieGithub Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	for(var/obj/item/Item in T.contents)
	for(var/obj/item/Item in T)

		@@ -1,4 +1,4 @@
		GLOBAL_LIST_INIT(vessel_ids, list(WHITELIST_AUTOMATON, HARLEQUINN_VESSEL_ID))
		GLOBAL_LIST_INIT(vessel_ids, list(WHITELIST_AUTOMATON, HARLEQUINN_VESSEL_ID,BROODSPAWN_GOBLIN_VESSEL_ID,BROODSPAWN_TROLL_VESSEL_ID,BROODSPAWN_ORC_VESSEL_ID, BROODMOTHER_VESSEL_ID, PUTRID_VESSEL_ID))

Uh oh!

Conversation

dwasint commented Jul 6, 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

Pre-Merge Checklist

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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dwasint commented Jul 6, 2026 •

edited

Loading