Commit Graph
3626 Commits
Author SHA1 Message Date
CRUNCHandGitHub abb18179f7 Fixes Broken Shuttle (#30619)
* Update centcomm.dmm

* Update centcomm.dmm
2025-10-07 01:13:53 +00:00
AlanandGitHub 39a4720d7b Move medchem intercom on Cyberiad. (#30403)
* Rotate captain's bed and move medchem intercom on Cyberiad.

* Put the bed back.
2025-10-06 22:59:17 +00:00
CRUNCHandGitHub fed47a701a discs (#30507) 2025-10-06 20:10:09 +00:00
CRUNCHandGitHub d37089c13d Slight Touchup of the Default Emergency Shuttle (#30508)
* Update emergency_cyb.dmm

* sguttle

* aaa
2025-10-06 19:33:49 +00:00
AlanandGitHub 4efba18186 Separate lights and wallbumps on boxstation/Cyberiad. (#30424)
* Separate lights and wallbumps on boxstation/Cyberiad. Fixes #27020

* Fix APCs

* Tangle with floor lights and cable walls.

* Integrate feedback.

* Integrate feedback better this time.
2025-10-06 19:07:50 +00:00
PollardTheDragonandGitHub 66d66a8f02 Adds Anomaly Refining System (#30490)
* Adds Anomaly Refining System

* Weight class

* Linters

* Fixes delta lint

* Removes emag text on examine. Examine now tells the explosion target.

* Address code review
2025-10-06 18:20:50 +00:00
1080pCatandGitHub 118a986373 Moves some notes in MB19 to be lore consoles (#30518)
* lore consoles

* warrior review
2025-10-04 17:27:23 +00:00
CRUNCHandGitHub 0f3c083c77 Update cerestation.dmm (#30506) 2025-10-03 00:46:33 +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
MigratingcocofruitandGitHub ad98a804cb Adds the alien cache ruin and a PTL terminal (#30367)
* Make the cache room

* adds alien cache machine

* adds the cache properly

* adds multitile component

* adds terminal building and reward selection procs

* adds laser receptacle file

* Refactors ptl targetting code

* more work on the ptl terminal

* change file name to laser_terminal

* changes area to powered makes laser terminal work properly

* makes a new pickweight function because the old one is bad

* Update alien_cache.dm

* Update canister.dm

* Update alien_cache.dm

* adds a template of the ruin

* adds some spawners to the reward pool

* adjusts agent b amount

* adjustments to loot table and changes to spawner comments

* new placeholder sprite for the cache

* randomizes reward spawn location and makes a PTL terminal sprite

* updates alien cache sprite and examine proc

* Adds overlays to the cache to indicate the current progress

* fixes mob capsule spawner and laser terminal

* Adds animations to PTL terminal

* new box part of the sprite for the PTL terminal. Adds glow

* fixes untargetting the PTL terminal and adds a little light overlay to the receiving dish

* changes PTL terminal id generation slightly

* adds simon says. incomplete

* Update paradise.dme

* simon says works now

* adds more rhythms

* Adds success and failure sounds

* Makes the ptl terminal board printable

* Update secure_alien_airlock.dm

* undo changes to preferences.dm

* undefs things

* removes identical to parent vars

* Update alien_cache_random_spawners.dm

* replaces animation end loop flag so open dream CI doesn't give errors

* changes centre platform colour and adds a fan to the entrance

* more pads more sounds

* better sprites

* remove old sprite

* adds the cache to example config

* makes it not always spawn

* Update simon_says_32x32.dmi

* adds some flavor to the ruin

* Update alien_cache_site.dmm

* adds a signal to the ruin
2025-10-01 12:54:10 +00:00
kyunkyunkyunandGitHub caa8343bf7 Repath some satchels (#30427)
* fix satchel interactions

* updatepaths name
2025-09-27 08:46:36 +00:00
PollardTheDragonandGitHub b544b395a4 Trader shuttle door access fix (#30544)
* Vox ruin areas

* Fixes Sol Trader Shuttle Access

* Revert "Vox ruin areas"

This reverts commit 6a02479a5a.
2025-09-25 14:49:30 +00:00
warriorstar-orionandGitHub b84eb1d768 fix incorrect toolbelt in delta cargo (#30469)
* fix incorrect toolbelt in delta cargo

* fix splashscreen_sandbox.dmm
2025-09-24 17:50:47 +00:00
AlanandGitHub 5c8ef29c09 Recenters windows between chairs in deltastation medbay. (#30425) 2025-09-24 13:36:19 +00:00
PollardTheDragonandGitHub a69b9d159a Purges carp spawner outside kerberos cargo shuttle (#30413) 2025-09-24 13:06:51 +00:00
iramoyeandGitHub 68fec5efff Removes carp spawners from Vault space on Delta (#30494)
* Initial commit

* man get that fish back in there

Puts the carp spawner back in Cargo Bay, since there's already a PR to remove it from there.
2025-09-24 12:56:14 +00:00
211ccbe233 Converts airlocks to have departmental based wires. (#30196)
* the majority

* Update code/game/area/ss13_areas/science_areas.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-09-22 17:41:26 +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
MigratingcocofruitandGitHub db555b4c28 Powernet separation (#29348)
* Adds reinforced APCs and frames for them.

* farragus WIP

* more farragus stuff

* more faragus stuff

* more farragus

* uses plastic for insulation instead

* box and faragus changes

* Box changes

* cerebron changes

* more meta updates

* fixes short on box station

* fixes shorts on meta station

* delta changes

* adds reinforced apcs with bigger cells

* emerald things

* more diagoras

* cleaning up cables in diagoras

* switches elecmaints smes to the engineering type on diagoras

* adds more grid monitors to cyberiad

* various corrections

* 2 doors on cyberiad electrical maints

* boxstation fixes

* Kerberos fixes

* cerebron fixes

* some faragus fixes

* more cyberiad fixes

* meta fixes

* more kerberos fixes

* faragus and cyberiad fixes

* emerald fixes

* farragus fixes

* emerald fixes

* farragus fixes

* emerald fixes

* diagoras fix

* more map fixes

* more CI fixes

* final fixes I hope

* Update emeraldstation.dmm

* finish merging metastation

* reset meta to master version

* redoing some of the meta changes

* Update metastation.dmm

* clear merge conflict

* Update metastation.dmm

* Update metastation.dmm

* Update metastation.dmm

* meta resolution

* emerald resolution

* delta resolution

* fartgas resolution

* box box

* stay out stay out

* metastation fixes

* faragus fix

* delta fix

* 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

* Update cerestation.dmm

* 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

* 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

* resolves box conflicts

* Update cable.dm

* remove floating request console

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

* resolves faragus conflict

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

* 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

* 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

* 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

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

* resolve conflicts

* migrates new cable type to new attack chain

* Update cable_coil.dm
2025-09-22 12:52:15 +00:00
warriorstar-orionandGitHub df0e69332f fix paper wrapping crates (#30482)
* fix paper wrapping crates

* define magic number
2025-09-19 16:05:48 +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
CRUNCHandGitHub e529ce7a23 Standardizes the permabrig seed inventory. (#30400)
* Update departmental_vendors.dm

* seeeeeeed

* moreseed

* Update departmental_vendors.dm

* Update deltastation.dmm

* e
2025-09-19 14:50:27 +00:00
KyaniandGitHub 622d0e2d7e Centcomm direct contact: Starline (#30366)
* ddsadsa

ddsadsa

* moderate again

* revert

* almost done

* done!

* revert red phone

* added a headset because why not

* add sounds

* linting

* Update headset.dm

* Update headset.dm

* linting

* linters
2025-09-19 13:46:31 +00:00
PollardTheDragonandGitHub 9797083cdd Adds salvage redemption machine (#30359)
* Adds salvage redemption machine

* Added flammable flag to credit redemption slip

* Linters

* Linters!

* Machine icon, animations, and spellcheck

* Better sprites + animation timing

* Removes vestigial code
2025-09-18 17:36:00 +00:00
AhzpyandGitHub bd911799b8 Librarian Drip Expansion (#30167)
* all the sprites in the wrong place

* suits are now in the suit files

* code and whatnot

* oops all config

* hand holes, locker, garment bag, loadout

* adds locker to every station

* some fixes

* pleases review overlords

* fixes errors?
2025-09-16 18:59:32 +00:00
AlanandGitHub 9b16a276c0 Separate lights and wallbumps on deltastation/Kerberos. (#30418)
* Separate lights and wallbumps on deltastation/Kerberos. Fixes #27021

* Remove lights from windows on deltastation.

* Tangle with floor lights and cabled walls
2025-09-15 16:07:53 +00:00
CRUNCHandGitHub e8ef60fb78 Update boxstation.dmm (#30345) 2025-09-15 12:41:59 +00:00
CRUNCHandGitHub 763bd32861 The Smoking Expansion DLC II - The Second Puff (#30334)
* King's Own Tobacco

* Update cigs.dm

* cigar boxes

* badass

* CI

* CI (again)

* Update centcomm.dmm
2025-09-15 12:39:13 +00:00
CRUNCHandGitHub f66f87968a Deploys Ashtrays and Cigarettes across Metastation (and also gives heads their pens). (#30374)
* Update metastation.dmm

* Update metastation.dmm
2025-09-14 21:03:55 +00:00
warriorstar-orionandGitHub 12c3f5afe2 add access helpers to delta brig mule entrance (#30361) 2025-09-14 20:25:33 +00:00
warriorstar-orionandGitHub 3208049a8a Attack chain migration: structures. (#30365)
* Attack chain migration: structures.

* whoops

* wth
2025-09-14 19:21:36 +00:00
iramoyeandGitHub cd7b4e7292 tools the belt as expected (#30391)
Adds one toolbelt. Just one. Just like Cyberiad.
2025-09-14 19:20:07 +00:00
CRUNCHandGitHub afb2afd4f6 Gives the Bartender a Toolbox (#30346)
* tools

* Update cerestation.dmm
2025-09-14 19:02:36 +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
CRUNCHandGitHub 9588a56267 Polishes the Delta Permabrig (#30370)
* Update deltastation.dmm

* Update deltastation.dmm

* Update deltastation.dmm
2025-09-12 20:55:03 +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
fca03efeb0 Exfiltration - Early Antag Escape (#29554)
* Ghost bar antag addition

* Adds extraction flares and extraction procs

* Ghostbarification, antag-specific extractions

* Objectives reroll if target extracts

* Comment format

* Adds blackboxing. Prevents extraction if you're an objective target.

* Fixed objective freezing, removes mindslaves on exfiltration

* Vampire Portal Sprites

* Better sprite for portal

* Flayer telepad, assorted visual adjustments

* Makes flayer and vampire portals truly one time use. Flayer ability icon

* Fixed indents, vampire ability icon

* Changeling flare

* Removed some debug adjustments

* Map fixes

* Makes the exfil restriction a var on the datum

* More map fixes

* Centcomm my beloathed

* More map fixes

* Checks delay before objectives

* Objective freezing list fix

* Review fixes

* Moves a lot of exfil item granting logic to antag datum.

* Changed objective exfil block from var to proc

* Centcommmm

* Adds true return. Thanks Contra.

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

* Efficiency

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

* Moved jaunter subtypes

* Forgot to move the admin one

* Capitalization

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

* Reworked area selection

* Black box, admin log, proper clearing of martial arts and bio chips

* Exfiltration now properly checks completion of alive and free escape objective

* Adds announcement to security comms when exfil item is used

* Linters

* Map adjustments

* Fixes syndiebar library computer access

* Merge conflict resolution

* Updates action buttons

* New Linters

* Update centcomm.dmm

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
2025-09-09 01:28:09 +00:00
Hayden RedactedandGitHub b5b5ce45d9 Flips the Captain's Bed on Cyberiad (#30294) 2025-09-09 00:28:29 +00:00
CRUNCHandGitHub a9c5f5c39a Removes Genetics from Delta Station Medical, Moves to Science (#30024)
* Update deltastation.dmm

* Update deltastation.dmm

* Update deltastation.dmm
2025-09-08 21:12:14 +00:00
CRUNCHandGitHub 03535b4608 Remaps the Space Around BoxStation Atmos (#29967)
* Update boxstation.dmm

* Update boxstation.dmm
2025-09-08 20:44:29 +00:00
CRUNCHandGitHub d175f3d1e4 Updates Genetics on Every Station Except Delta (#30027)
* creation

* Update emeraldstation.dmm
2025-09-08 18:17:27 +00:00
Hayden RedactedandGitHub e660a30e68 Culls Extra Air Alarms from Metastation Arrivals (#30293) 2025-09-04 07:07:27 +00:00
Hayden RedactedandGitHub 2f2ca4c9ab Ensures There's Working Cameras in NCT/NTR/BS Emeraldstation Offices (#30292) 2025-09-04 07:06:38 +00:00
Hayden RedactedandGitHub c2490cf6ac Fixes the Transit Tubes On Meta/Deltastation being Facing the Wrong Way (#30291) 2025-09-04 07:06:03 +00:00
CRUNCHandGitHub 7dfbaed08d cone (#30280) 2025-09-04 06:58:23 +00:00
PollardTheDragonandGitHub 4cad16248d Fixes diagonal wall floor appearance for grey trade ships (#30246) 2025-09-04 06:46:16 +00:00
CRUNCHandGitHub aaba002f18 Farragus Service Asteroid Polish Pass (#30240)
* Update cerestation.dmm

* Update cerestation.dmm

* continued work

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update maintenance_areas.dm

* CI

* Update cerestation.dmm
2025-09-04 06:44:20 +00:00
CRUNCHandGitHub 6f04d4b133 Slightly remodels the BoxStation medical reception (#30202)
* Update boxstation.dmm

* Update boxstation.dmm
2025-09-04 06:40:20 +00:00
PollardTheDragonandGitHub f0ddf0a4ba Nerfs Poultices (#30110) 2025-09-02 05:48:06 +00:00
AhzpyandGitHub bba55ba75f Nanocratesen: Corporate Crates (#30190)
* sprites and obj

* Update pack_miscellaneous.dm

* sprite fix

* replaces vault crates
2025-09-01 04:30:09 +00:00