Commit Graph
120 Commits
Author SHA1 Message Date
e609a7faf7 Event system refactor and changes (#29420)
* meta resolution

* emerald resolution

* delta resolution

* fartgas resolution

* box box

* stay out stay out

* metastation fixes

* faragus fix

* delta fix

* Changes to role impact on event weight

* adds disaster level to the event config

* weight changes and starts adding disaster level to the ui

* ui fixes

* adjust disaster level timing

* changes disaster timing, weights, disease outbreak role requirements and weights

* lots of weight an requirement adjustments

* Update tear.dm

* some fixes

* meta changes

* Starting over with farragus

* Starting over in faragus

* faragus changes

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* resolving some faragus conflicts

* resolve faragus conflicts

* resolves delta conflicts

* resolves cyberiad conflicts

* resolves emerald conflicts

* fixes cables in faragus

* fixes meta cables

* fixes delta cables

* more meta fixes

* more farragus cable fixes

* more cable fixes

* meta and faragus fixes

* box and delta fixes

* more mapping fixes

* hopefully the last fix

* Update metastation.dmm

* Update metastation.dmm

* fixes shorts on cyberiad cerebron and farragus

* CI fixes

* move new event listing to new system

* Adds tracking and cost calculation for blob

* finishes setting up blob event detection and costs

* minor boolog corrections

* fixes events being created at the wrong severity

* adds ongoing cost to disease outbreak

* moves terror spider event to new system

* moves to component based event cost calculation

* morph abductor and carps adjusted for new system

* various fixes and adjusts rev event

* Update revenant_spawn_event.dm

* various fixes and adjusts demon incursion to the new system

* adjusts some major event weights

* correct wrong values of autoend on vendor uprising and rev

* Update event_container.dm

* more event timing adjustments

* adds requirements to traders and incursion

* slightly lowers requirements for biohazards

* timing changes

* temporarily disable loading event times from the config and increases major nothing chance

* adjustments to costs and weights of various events

* Update event_container.dm

* additional adjustments to weights and requirements. moves rev to major

* typo fix

* ion storm adjustment

* Update event_container.dm

* more moderate changes

* e

* Update meteors_event.dm

* removes cooldown from nothing event and changes its weight based on the number of remaining enabled events in the container

* increases morph event requirements and chance of nothing moderate event

* makes morph a major event

* Update morph_event.dm

* adds viro requirement for disease outbreak and fixes a bug with incorrect resource calculation

* allows varediting extra roles for the event system for debug and testing

* Adjust weights of traders and abductors and corrects wrong nominal severity for demonic incursion

* Adds crew cound to rev weight

* makes disasters start rolling later

* reduces weight of communications blackout and increases weight of major nothing

* adjusts door runtime and prisonbreak weights to make them less frequent. kudzu now scales with total crew

* apc overload made less frequent

* oopsy

* Gives the scrubber clog event a name

* fixes a type in a define name

* adjusts demonic incursion weight

* changes brand intelligence weight an d reduces door runtime weight

* more adjustments to demon incursion. Makes additional weight from surplus roles diminish

* adjustments to some minor events

* Increases event length and requirements of some engineering events and lowers their weight slightly. Also increases cost of ongoing diseases events

* fixes a type

* Update meteors_event.dm

* corrects traders nominal severity and adjusts demon weights

* shifts anomaly weights down and increases costs

* rebalance rod requirements

* Update cerestation.dmm

* moves net resource calculation to its own proc and changes the ASSIGNMENT_TOTAL macro to ASSIGNMENT_CREW.

* Adds individual first run time for some events and makes majors start rolling slightly later

* reduces weight of major nothing

* minor reduction to rev and apc overload weight

* Changes the way event weight is calculated

* end time corrections for anomaly rod and meteors

* slightly adjusts down the weights of nothing and some minor events

* Adjusts moedrates towards about 3.5 per round and mundanes towards 8 per round

* adds first run restrictions on traders and incursion and increases the cooldown time of events

* resolve faragus conflicts

* resolve emerald conflict

* fix some faragus cabling

* more cabling correction in faragus

* more cable fixes

* Update cerestation.dmm

* remove doubled scrubber pipe on tile

* reduces moderates nothing chance

* slightly reduces crew requirements for disasters and also reduces crew weight for disasters

* fixes meteor event not removing the alert, and makes it announce a bit later

* Adds an event debugging window for real time midround event data

* Revert "Adds an event debugging window for real time midround event data"

This reverts commit ecd99a6c9e.

* Adds a resource view button to the event manager window and fixes a null in the total resource list

* various bug fixes

* slightly lowers chance of meteor and similar events

* Slightly lowers requirement weights on disaster level events

* resolves faragus conflict

* changes the default power input of engineering SMES to 200kw and 80kW respectively

* connects power monitoring computers to the grid that weren't

* meta station elec maints improvements

* adds missing power monitoring computers on box and delta

* removes dirt from wall

* corrects area boundry on meta

* adds missing cable on box sci

* removes dirt from wall on box

* connects cyberiad bridge to the rest of the powernet

* connects box brig to powernet

* Adds catwalks to box maints

* adds catwalks to meta

* Adds catwalks to delta

* Update deltastation.dmm

* adds ability to insulate cables

* Moves stations to using extra insulated cables for high power network

* Removes catwalks from meta

* Removes catwalks from box

* Removes catwalks from delta

* Delays moderates and majors more and increases disaster chance

* resolves box conflicts

* Update cable.dm

* remove floating request console

* corrects position of fire alarm and removes extra intercom on metastation

* resolves faragus conflict

* reduces meteor variant weights. meaty ores event now has the correct nominal severity

* meaty ore weight to 8

* fixes a stray light bulb and light switch in maints as well as a doubled power

* Delays meteor type events to 40 minutes at the earliest. Moves the time check to be against round time instead of world time

* wires kerberos security checkpoint to the grid

* Update cerestation.dmm

* Removes stray extinguisher cabinet from meta station

* resolves area conflict on faragus

* resolves more faragus issues

* fixes faragus cabling issues

* Update cerestation.dmm

* removes another stray fire extinguisher cabinet

* insulates the APC in delta PTL room

* increases pop requirement and weight for demons and increases medbay and viro weights for diseases

* connect delta fore starboard solars to the high power grid instead of the low power

* Update deltastation.dmm

* deconflict

* solves some unconnected cables

* connects delta customs to network and finishes resolving conflicts

* Update deltastation.dmm

* adds the new cables. needs coils and mapping

* moves connection perms to the heavy duty cables. toggled with engineering permission ID. box gets new cables

* sorts cables on stations

* faragus cable connections

* cable corrections. Adds heavy duty cables to the autolathe

* CI fix

* more fixes and makes the new cables show up on t ray scanners

* box station mapping fixes

* delta mapping fixes

* meta fix

* Update deltastation.dmm

* delta and faragus fixes

* Update emeraldstation.dmm

* removes APC overloard(major) from event pool

* adds diagonal sprites to heavy duty cables. allows sillicons to toggle them and

* Makes borg versions of the heavy duty cable coil

* palete consolidation

* Improves visibility of high power cables

* converts shuttle event to new system

* makes disaster event last run calc use round time instead of world time

* fixes wrong define being used in some event requirements. further increases requirements for demons and meteors. lowers weight of major diseases

* Update slaughterevent.dm

* reduces cargo requirements for shuttle load event

* reduces base weight of major disease event and further increases medical requirements

* fixes a wrong wire under the pet store maints door in delta station

* resolve mapping conflicts

* Revert "resolve mapping conflicts"

This reverts commit 129db52501.

* Revert "Merge branch 'HighPowerMaints' into event_timing"

This reverts commit 2594ac8928, reversing
changes made to a738b5f2f2.

* fixes some wonky stuff with xeno code

* Adds a crew cost to diseases

* makes player contribution towards events variable

* changes major event weights and slightly increases demon requirements

* slightly increases major disease outbreak weight

* comment changes

* Adds safeties to protect against null events getting into container or the active list

* blob fix

* Adds a confirmation to random event toggle

* Adjust particulate event weight to fit the new moderate weights

* Adds additional security costs to changeling and vamp

* Update revenant_spawn_event.dm

* uses correct path for rev event cost proc

* changes some lists to alists

* correctly accesses the event container list and actually uses the config for the event timing

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman3595@gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-11-07 16:29:47 +00:00
PollardTheDragonandGitHub 0933782236 Caps chickens (#30708)
* Caps chickens

* Address code review, adds to config.toml
2025-10-30 12:26:21 +00:00
PollardTheDragonandGitHub c62c41b85d Fixes diona nymphs having no description (#30788)
* Adds nymph desc

* Reorder
2025-10-29 23:44:23 +00:00
PollardTheDragonandGitHub ae4489cb2f Converts bees to basic mobs (#30662)
* Converts bees to basic mobs

* Undefs

* Linters
2025-10-28 20:53:18 +00:00
PollardTheDragonandGitHub a3b2c3a251 Refactors revenants to basic mobs (#30661) 2025-10-28 13:26:16 +00:00
KyaniandGitHub a82a5217b8 Basicmob Goliath Fixes (#30763)
* goliath updates

* goliath fix
2025-10-27 12:11:05 +00:00
879f43f88d Changes legions skulls and hivelord brood more to pre basic mob levels. (#30695)
* legion changes

* Moves it down to hivelord level now that we have it good

* Apply suggestions from code review

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-10-26 13:12:55 +00:00
MarmandGitHub 8d7723288b swarming-b-gone (#30685) 2025-10-26 13:05:09 +00:00
PollardTheDragonandGitHub 4688ad5647 Fixes migos dodging while dead (#30787) 2025-10-26 12:58:14 +00:00
dc3f8f6cc9 Port goliaths to basic mobs, Round 2 (#30566)
* Port goliaths to basic mobs.

* linting whitespace

* more linting

* wtf

* Addresses reviews on prior PR, adjusts behavior for food searching

* Missing Comma

* Goliath aggro range

* Reduces goliath speed to 5 from 3

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-10-21 19:27:27 +00:00
da37a3a59d Converts blob mobs to basic mobs (#29806)
* Converts blob mobs to basic mobs

* Linters

* Updatepaths

* Apply review changes

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* New linters

* Intents

* Lints

* Fixes blobbernaut AI being active after being offered

* Linters

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-10-01 16:25:57 +00:00
PollardTheDragonandGitHub 2569be37ba Adjusts Hivelord Brood and Legion Skulls (#30551) 2025-10-01 14:36:41 +00:00
PollardTheDragonandGitHub e14a43eea1 Basic diona nymphs, spiderbots, and crabs (#30377)
* Basic nymphs, spiderbots, and crabs

* Nutrition fix

* Forgot a line

* Cooldown on eat

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-10-01 14:32:00 +00:00
warriorstar-orionandGitHub 3e39dae7ff fix mouse squeak (#30528) 2025-09-22 20:43:47 +00:00
7caf75b37b Converts mice to basic mobs (#29928)
* Converts mice to basic mobs

* Larger only targetting strat

* Oops.

* Linters

* Code review suggestions

* Linters

* Merge conflict resolution

* Snakes

* Oops

* Clogged Disposals

* Updates persistent client

* Linters

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-09-22 13:11:44 +00:00
kyunkyunkyunandGitHub 83509c3967 Some more armor tweaks (#30398)
* summary

* (required)

* undef

* oh this is unused, nice

* ok but.. why

* a tiny bit more

* Update human_defense.dm

* Update mass_hallucination.dm
2025-09-19 15:43:42 +00:00
PollardTheDragonandGitHub b52f6cc6c0 Converts farm animals to basic mobs (#30244)
* Converts farm animals to basic mobs

* Update paths, removes excess file

* CI

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-09-19 15:26:43 +00:00
PollardTheDragonandGitHub 1e9adf9d7b Converts Trees and Panthers to basic mobs (#29992)
* Converts trees and panthers to basic mobs

* Oops

* Another oops

* Whoops

* Update paradise.dme

* CI fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-09-19 14:21:01 +00:00
PollardTheDragonandGitHub e3725f7452 Fixes issue with basic mobs and xenos attacks (#30492) 2025-09-19 03:08:06 +00:00
PollardTheDragonandGitHub 317c8be1b0 Fixes nian caterpillars becoming ravenous when fully fed (#30386)
* Fixes nian caterpillars becoming ravenous when fully fed

* Cooldown
2025-09-14 19:03:24 +00:00
kyunkyunkyunandGitHub 8821ab9a66 Updates a couple of /obj/item variables (#29829)
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
2025-09-14 15:23:56 +00:00
0f438326b6 Converts Viscerators and Malfunctioning Combat Drones to Basic Mobs (#30080)
* Initial Commit

* Targetting

* Linters

* Update code/modules/mob/living/basic/retaliate/combat_drone.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* CI fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-09-11 02:34:37 +00:00
kyunkyunkyunandGitHub 10f2e67e65 Cleanups and tweaks observer code (#30250)
* observer cleanup

* this

* bit more

* Update tgui.bundle.js
2025-09-05 05:54:22 +00:00
ToasticalandGitHub 8f98876b47 adds a description to moth worms (#30325) 2025-09-05 01:58:36 +00:00
PollardTheDragonandGitHub a4b1ac0444 Giant changeling spider aggression fix (#30274)
* Giant changeling spider aggression fix

* Moved changeling spiders to _DEFINES and used them as needed
2025-09-04 15:50:00 +00:00
PollardTheDragonandGitHub 69a3b5835b Gives Billy (big legion) an AI Controller (#30344)
* Gives Billy an AI Controller

* Small fix
2025-09-04 07:19:28 +00:00
626eaaeb79 Removes british spelling of armor from armor_penetration vars (#30104)
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-09-01 04:27:52 +00:00
PollardTheDragonandGitHub 58865cd52a Fixes gutlunch targeting (#30331) 2025-08-30 14:32:18 +00:00
PollardTheDragonandGitHub a3d9ecf4c9 Fixes gutlunch controllers (#30277) 2025-08-28 14:48:38 +00:00
c6e164a643 Basic gutlunch and goldgrub (#30032)
* Goldgrubs

* Gutlunches, breeding code, goldgrub fixes

* Lints

* Extra define

* Config screwup

* Linters again

* Oops

* Gets rid of extra kangaroo

* Formatting and grammar

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-08-25 17:52:42 +00:00
PollardTheDragonandGitHub 0ae73635e2 Adds some generic AI controllers (#30061)
* Generic controllers

* Linters
2025-08-22 15:33:14 +00:00
PollardTheDragonandGitHub 6d5fc55299 Shuts up mobs that aren't near anyone (#30186)
* Shuts up mobs that aren't near anyone

* Hivebots too
2025-08-22 15:23:16 +00:00
PollardTheDragonandGitHub e43a88de5b Converts Nian Caterpillars to Basic Mob AI (#29938)
* Nian Caterpillar Basic Mob

* Merge conflict resolution

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-19 13:40:31 +00:00
f68676267c Adds no-harm check to ai retaliate, adjusts clown AI (#30166)
* Adds no-harm check to ai retaliate, adjusts clown AI

* Update code/modules/mob/living/basic/retaliate/clown.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-08-19 13:12:36 +00:00
PollardTheDragonandGitHub a211bdb7f3 Adjusts revenant possessed objects (#30007)
* Adjsuts revenant possessed objects

* Update posessed_object.dm . Fat fingered a health value to be too nice.

* Reduced health to 40
2025-08-19 13:07:49 +00:00
PollardTheDragonandGitHub 66615e9a2a Tweaks watchers and legions (#30028)
* Tweaks watchers and legions

* Linters

* Flight fix

* Fixes aggro range
2025-08-19 06:50:54 +00:00
PollardTheDragonandGitHub 52c194028b Converts lightgeists to basic mob AI (#30008)
* Converts lightgeists to basic mob AI

* Linters
2025-08-12 15:55:28 +00:00
PollardTheDragonandGitHub d8caf6826e Cliented basic mobs now do not worry about basic mob attack delays (#30058) 2025-08-10 22:22:34 +00:00
PollardTheDragonandGitHub ea367a68c1 Small alien basic mob speech fix (#30034) 2025-08-10 18:20:44 +00:00
PollardTheDragonandGitHub 4b6d015184 Fixes araneus oversight (#30033) 2025-08-10 14:41:55 +00:00
PollardTheDragonandGitHub 4f77a856f0 [s] Fixes certain types of hellhounds spawning from gold cores (#30030)
* Fixes certain types of hellhounds spawning from gold cores

* Damn it
2025-08-08 01:36:26 +00:00
PollardTheDragonandGitHub cb2032f7d4 Converts simple xeno mobs to basic mobs (#29975)
* Basic xenos

* Fixed config, better ranged code

* Syndiecakes corgis

* Lavaland subtypes

* Renames files because conflict with midround xenos

* Linters, enviro-smash

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-07 16:30:36 +00:00
PollardTheDragonandGitHub 32c1d64849 Fixes dead demon rendering when dying in a clown car (#29970)
* Fixes dead demon rendering when dying in a clown car

* Better implementation, fixes more shit
2025-08-07 16:11:33 +00:00
PollardTheDragonandGitHub 4d732dbb7f Basic Mob Lazarus Revival (#29891)
* Basic mobs revivable with lazarus

* Allows basic mobs to revive through lazarus, fixes basic mob revivals
2025-08-06 11:13:20 +00:00
6701e12613 Converts Pirates, Soviets, and Drakehounds to basic mob AI (#29903)
* Converts pirates, soviets, and drakehounds to basic mob AI

* Linters and fixes

* Pirate fire rate adjustment

* Merge fixes

* Better ranged attack code

* Even better ranged code

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-08-06 06:30:29 +00:00
PollardTheDragonandGitHub 1054b263bb Converts Watchers and Legions to basic mob AI (#29884)
* Converts basilisks, watchers

* Hivelords and legions

* Hivelordbrood balance adjustment

* New Linters

* Speech fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-06 05:54:06 +00:00
PollardTheDragonandGitHub d772497e80 Converts kangaroos to basic mobs (#29874)
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-06 05:40:22 +00:00
761f3e0647 Miscellaneous minebot fixes. (#29910)
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-08-06 05:22:26 +00:00
3b0a9c4381 Converts a whole lot of friendly mobs to basic mob AI (#29815)
* Butterflies, Cockroaches, Slothes, Snakes, Penguins, and Bunny Basic Mobs

* Lizards too

* Oops

* Lizard emote keybind

* Updatepaths

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Moved lizard emote to basic_emotes.dm, simplified hide action

* New linters

* Merge conflict resolution

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-08-06 01:17:13 +00:00
PollardTheDragonandGitHub e472c31976 Moves possessed objects to basic mobs (#29851)
* Moves possessed objects to basic mobs

* Linters

* Merge conflict resolution

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-05 16:17:55 +00:00