Commit Graph

23699 Commits

Author SHA1 Message Date
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
PollardTheDragon
e4b5e22917 Fixes some basic mob zaps (#30569) 2025-09-28 16:29:35 +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
CRUNCH
904de7c5c2 Increases the RND objective requirement from 2 to 3 (#30412)
* Update science.dm

* Update science.dm

* Update code/game/jobs/job_objectives/science.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update science.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-09-27 08:46:05 +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
Qwertytoforty
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
PollardTheDragon
e1d8325fbb More SRM fixes (#30522) 2025-09-22 15:14:15 +00:00
Alan
32b127ebb2 Add better-fitting hoods for monitor heads. (#30200)
* Add better-fitting hoods for monitor heads.

* Fix some icons not animating properly, thanks IconDiffBot2!

* Here you go

* Incorporate linter feedback.

* Re-order the checks slightly to make the hoods render.

* Defluff

---------

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-09-22 13:15:35 +00:00
PollardTheDragon
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
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
Mason
9eb7618a3f Revert "Make hotspots go out easier. (#29805)" (#30136)
This reverts commit c0acf193a0.
2025-09-19 21:22:52 +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
PollardTheDragon
9af452c0ce Fixes oversights in salvage redemption machine (#30491) 2025-09-19 15:55:34 +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
kyunkyunkyun
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
PollardTheDragon
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
CRUNCH
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
Osetrokarasek
b9581ce380 Adds New "Carcinoma Angel" Cigs (#30338)
* vkfdnvhy

- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.

* Update drugs.dm

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* cough... new()...

* Update cigs.dm

* Update fancy.dm

* Update drugs.dm

* Update cigarettes.dmi

* Update cigarettes.dmi

* Update cigarettes.dmi

* Revert "Update cigarettes.dmi"

This reverts commit 831790523e.

* Update cigarettes.dmi

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-09-19 14:24:59 +00:00
Kyani
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
iramoye
e3f373077e Initial commit (#30486) 2025-09-18 19:30:21 +00:00
PollardTheDragon
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
Ahzpy
ac0c45d73a poster (#30337) 2025-09-18 06:11:28 +00:00
Ahzpy
e55a562a52 Smoke Break; Lighter Resprite (#30336)
* resprite cheap and zippo lighters

* update NTR zippo description
2025-09-18 06:11:15 +00:00
Ahzpy
40bb19e772 It Came From Outer Spess; Abductor Drip (#30263)
* code and sprites

* code/sprite fixes + corpses

* i dont want to edit the dme today

* removes a stripe from open labcoat icon

* item_state? never heard of em
2025-09-18 06:09:53 +00:00
Osetrokarasek
5e29e1ff0c Resprites Medkits (#30194)
* vloebjud

* vmjencjsv

- added inhand sprites

* ldfsovjnah

- Fixed icon for tactical kit

* bmjuamkvbf

- Fixed icons for ancient kit

* Update firstaid.dm

* fjdyvygt

- Review thingy

* Update firstaid.dm

* adsdada
2025-09-18 06:09:10 +00:00
PollardTheDragon
280ab5c19f Stops homerun bat from storing homerun charge after drop (#30478) 2025-09-18 06:00:34 +00:00
PollardTheDragon
8bfbf74c16 Fixes node cable amounts (#30477) 2025-09-18 03:39:57 +00:00
Ahzpy
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
CRUNCH
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
Osetrokarasek
058ca75ce8 Update medical_jobs.dm (#30343)
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
2025-09-14 21:08:02 +00:00
1080pCat
4ffa9870cd Migrates the baseball bat to the new attack chain, and makes it use tg cooldowns (#30387)
* migrates the baseball bat to the new attack chain, and makes it use tg cooldowns

* meant to revert that

* moves a var

* Update weaponry.dm
2025-09-14 19:52:30 +00:00
warriorstar-orion
3208049a8a Attack chain migration: structures. (#30365)
* Attack chain migration: structures.

* whoops

* wth
2025-09-14 19:21:36 +00:00
CRUNCH
7ef1e3a68c Adds ACCESS_CARGO_BOT to get_all_accesses(). (#30384)
* Update access.dm

* Update access.dm
2025-09-14 19:04:36 +00:00
kyunkyunkyun
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
Osetrokarasek
641d05863c ddd (#30339) 2025-09-11 03:17:48 +00:00
PollardTheDragon
df45d21da3 Ports the Shuttle Loan Event (#30138)
* Ports the Shuttle Loan event

* Russians -> Soviets

* Oops

* Grammar

* Better item name

* Defines

* Linters

* 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>

* Debug logs

* Use UIDs. Fixes bomb timers

* 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>

* Static Lists

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-09-11 02:59:51 +00:00
PollardTheDragon
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
Contrabang
e8f67c5e81 Makes Genetics fully a sci department (#30017)
* genetics -> sci

* Update code/game/jobs/job/science_jobs.dm

Signed-off-by: Burzah <116982774+Burzah@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-09-09 18:20:39 +00:00
PollardTheDragon
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
PollardTheDragon
7a0918b330 Removes Greentext 2: Electric Boogaloo (#30131)
* Nukes Greentext

* Apply suggestions from code review

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

* Fixed hanging font closure

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-09-09 01:26:55 +00:00
kyunkyunkyun
6862135913 Ports some old TG lighting + opacity refactors (#29724)
* lighting ports

* missed these

* fix

* tweak optical scanners

* Update code/datums/elements/light_blocking.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-09-08 19:25:37 +00:00
kyunkyunkyun
11962e1b94 Fix armor penetration increasing negative object's and mob silicon's armor (#30105)
* fix

* no src allowed
2025-09-07 11:34:29 +00:00