Commit Graph

11636 Commits

Author SHA1 Message Date
Toastical
be0a0cec72 migrate crowbars to new attack chain (#30816) 2025-11-02 16:00:15 +00:00
Gatchapod
7a2577f725 please please work (#30850)
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2025-11-02 05:50:54 +00:00
Gatchapod
9863606763 entire messed up branch in one commit (#30794)
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2025-10-31 22:56:33 +00:00
AffectedArc07
378dfc3382 Removes some unused radio vars and defines (#30808)
* Removes some unused radio stuff

* oop
2025-10-30 12:13:10 +00:00
PollardTheDragon
ae4489cb2f Converts bees to basic mobs (#30662)
* Converts bees to basic mobs

* Undefs

* Linters
2025-10-28 20:53:18 +00:00
PollardTheDragon
a3b2c3a251 Refactors revenants to basic mobs (#30661) 2025-10-28 13:26:16 +00:00
Christer2222
4dc764a9cf lowers fence volume (#30814) 2025-10-28 10:55:41 +00:00
warriorstar-orion
601ff5601e allow for undershirts to be ckey-enabled (#30795) 2025-10-26 22:17:32 +00:00
Qwertytoforty
b74375d118 the dead don't rise and nanopaste helps: organ edition (#30712) 2025-10-26 13:11:34 +00:00
Qwertytoforty
d9d3d44018 Makes ai upgrades the same size as every other disk (#30748)
* makes ai upgrades the same size as every other disk

* 😠
2025-10-26 13:01:42 +00:00
CRUNCH
3e7c8e4408 Migrates the RSF to the New Attack Chain (#30701)
* RSF attack chain migration

* Update code/game/objects/items/RSF.dm

Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
2025-10-26 12:57:30 +00:00
Qwertytoforty
2ecff9033a [PTBF] [ready for review] Anomalous particulate processing objective. (#30649)
* pausing work on this till pickweight

* push

* more stuff

* proper file it

* these 2 would be interested

* and examine fix

* I should be more awake before resolving merge conflicts

* god you are stupid stop commiting every 2 seconds

* temp buff size change

* Event inhand descriptions

* behold the c o d e

* the rest of the owl

* sprite correction

* 2 more words to the list

* and this one

* yes I am having too much fun with this

* m o r e

* better glow, tech levels

* Apply suggestions from code review

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

* message admins, variable

* Apply suggestions from code review

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

* PPPProcessor

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com>
2025-10-25 01:01:03 +00:00
CRUNCH
c1da0b30c7 Update tables_racks.dm (#30702) 2025-10-23 15:54:48 +00:00
Alan
d55e4552c5 Fix the Captain's saber being invisible and undrawable in the eyes of others. (#30749) 2025-10-23 10:10:02 +00:00
PollardTheDragon
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
Toastical
28f7414c64 fix RPD interactions with storage and UI elements (#30629) 2025-10-21 19:15:54 +00:00
PollardTheDragon
3e149e8e6b Improved Ashwalker Armory: Bone Equipment (#30600)
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix

* sword inhands

* Adds Light Bone Armor

* Linters

* Species sprites

* Fixes my crap grammar

* Updates belt icon sprite
2025-10-19 19:06:58 +00:00
CRUNCH
5cb7eec5ad Adds Cult Chairs (#30587)
* V2 Ultrakill

* Update chairs.dm

* Update sheet_types.dm

* Update chairs.dmi

* Update chairs.dm
2025-10-19 19:06:44 +00:00
Ahzpy
428d34980e [MDB IGNORE] [IDB IGNORE] The Floorening (#30568)
* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* fix layering issue

* fix merge conflicts

* merge conflict fix?

* box bridge fix

* holodeck fix, layering fix, chemistry is no longer yellow

chemistry is intended to be a 'light orange' to be placed atop white tiles, just as medical decals are to command decals

* rebuild tgui

* merge master into floorening

* Update 30511_turfdecalsfix.txt

* merge master into floorening

* rebuild tgui

* holodeck fix, null plating fix

* Delete 30511_turfdecalsfix.txt

* updatepaths

* rebuild tgui

* null icon fix

* Update meatpackers.dmm

---------

Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-10-19 19:05:58 +00:00
Toastical
96d875e374 fuck my fucking botanist life (#30692) 2025-10-17 23:36:14 +00:00
CRUNCH
3210d12d56 Migrates Surgery Tools, Nuke Kits, and Nuke Cores to the New Attack Chain (#30442)
* super

* Update theft_items.dm

* Update theft_items.dm

* Update outfit_debug.dm

* Update code/game/objects/items/theft_items.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-10-17 17:58:35 +00:00
PollardTheDragon
fbd8930ff4 Securiblade Redux (#30488)
* Securiblade Redux

* It's back

* Vars

* LINTERS

* Apply AP on burn damage

* Fixes recharger bug

* Slapper, Better code, cleanup, no damage on help intent while off or stun, sounds

* Secblade now makes a sound when turning itself off
2025-10-17 17:00:50 +00:00
Alan
a9c3b6d242 Update winter coats, add more, and tailor to species. (#30644)
* Update winter coats, add more, and tailor to species.

* Add white captain coat to loadout.
2025-10-15 11:05:58 +00:00
Alan
b2e0a08d0b Add a LOT of chaplain clothes from various religions. (#30483)
* Add a LOT of chaplain clothes from various religions.

* Thanks, linter!

* Deploy vendors, box envirosuits, unaccent names

* Thanks, linters!

* Accommodate ears.

* Correct accent oversight.

* Merge branch 'master' into chaplain-outfits

Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
2025-10-13 15:16:33 +00:00
JimKil3
e5832d6d1f Makes sutures and regenerative mesh craftable (#30556)
* gauze/ointment changes
Changes gauze and ointment's recipe back to using sterilizine, nerfs their healing (they both serve other purposes)

* yummy microplastics
Makes plastic require cooling to solidify into sheets

* the rest of the PR

* oops

* what was he cooking

* Apply suggestions from code review

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

* plastic volume

---------

Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-10-11 15:58:24 +00:00
Osetrokarasek
a8a32eea7a Update flag.dm (#30602) 2025-10-08 23:55:03 +00:00
CRUNCH
4784679311 Adds Cult Tables (#30561)
* cult

* Update sheet_types.dm

* pylon
2025-10-07 17:52:47 +00:00
CRUNCH
3a201061f2 shelf (#30548) 2025-10-07 17:44:00 +00:00
Qwertytoforty
3c7ca73c04 Gives many cybernetics on mob sprites. Adds synthetic skin to allow hiding of them. (#30098)
* the first half

* rest of the skin

* duplicate

* new sprite / updated description / no more yell at me

* the rest of the owl

* oops, fixed
2025-10-06 18:30:31 +00:00
kyunkyunkyun
9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453)
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
2025-10-06 17:59:46 +00:00
CRUNCH
63f6856387 materials... Sols... Sols... (#30550) 2025-10-06 15:31:12 +00:00
CRUNCH
1bff8f5da9 RPD attack chain migration (#30574) 2025-10-06 15:29:37 +00:00
DetectiveEnotsky
7e8b6322d7 Fixes showers hiding behind posters (#30538)
* modified: code/game/objects/structures/watercloset.dm
changed north facing showers layer to 4, so they don't hide behind posters anymore.

* A smarter thing by @warriorstar-orion

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

---------

Signed-off-by: DetectiveEnotsky <87281888+DetectiveEnotsky@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-10-03 01:22:59 +00:00
PollardTheDragon
e29ace7bcc Fixes botany bag bit runtime and other bugs (#30597) 2025-10-02 01:23:02 +00:00
PollardTheDragon
b4c764a6c1 Fixes syndicate teleporter not breaking rock walls (#30560) 2025-10-01 16:23:18 +00:00
PollardTheDragon
0a829ba143 Nukes Xeno Revive Nest (#29376)
* Nukes Xeno Revive Nest

* Nukes Xeno Revive Nest

* Config changes are bad. Whoops

* Laying down on xeno weeds now cures viruses at the same rate as revival nests used to

* Adds owner virus check
2025-10-01 15:21:48 +00:00
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
PollardTheDragon
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
Migratingcocofruit
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
CRUNCH
bb61976b97 Makes /obj documentation better. (#30433)
* Update objs.dm

* Update objs.dm

* Apply suggestions from code review

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-09-27 20:34:24 +00:00
kyunkyunkyun
caa8343bf7 Repath some satchels (#30427)
* fix satchel interactions

* updatepaths name
2025-09-27 08:46:36 +00:00
Ahzpy
efe7cd98c9 Resprites and Animates gang-tool (Door Remotes) (#30278)
* sprites and code one fell swoop

* nukie reinforcement spawner sprite

* recolor for design team
2025-09-27 08:45:28 +00:00
warriorstar-orion
568a6681b7 fix melee attacks not working with tendrils (#30454) 2025-09-24 17:57:55 +00:00
Kyani
125d7f3716 Starline Fixes (#30527)
* fixes

* this is better

* i got it this time i swear
2025-09-24 13:01:36 +00:00
PollardTheDragon
0cf3efcbc2 Makes smith bag craftable with leather (#30465) 2025-09-24 12:57:50 +00:00
PopeDaveThe3th
60f5a240a4 disgustin (#30272) 2025-09-24 12:55:42 +00:00
Migratingcocofruit
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-orion
df0e69332f fix paper wrapping crates (#30482)
* fix paper wrapping crates

* define magic number
2025-09-19 16:05:48 +00:00
warriorstar-orion
94e7b1d007 add VV for ID cards and card access (#29897)
* add VV for ID card access

* Update code/game/objects/obj_vv.dm

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

* hell

* ID card VV

* dumb

* fix build

* log and message admins

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-09-19 15:54:31 +00:00
warriorstar-orion
860d091ee1 promote duplicate proc definitions to error (#29996)
* promote duplicate proc definitions to error

* up we go

* take 2

* add redefine allow for sstimer/fire

* fix recent regressions
2025-09-19 15:44:57 +00:00