Commit Graph

29000 Commits

Author SHA1 Message Date
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
CRUNCH
8f4111e05a Changes the description of the Value Pak PDA cart to not lie to the player and gives CC the better value pak and explosion immunity (#30481)
* wao

* Update cart.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-10-01 14:43:02 +00:00
Paul
2925af6829 Adds the boots of jumping (#30503)
* adds boots of jumping

* fix linter
2025-10-01 14:39:50 +00:00
PollardTheDragon
2569be37ba Adjusts Hivelord Brood and Legion Skulls (#30551) 2025-10-01 14:36:41 +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
AffectedArc07
77ee842926 [s] Testing stuff (#30572)
* Testing stuff

* lints
2025-09-28 19:20:32 +00:00
iramoye
3cc5de1a94 Init (#30565) 2025-09-28 16:32:20 +00:00
PollardTheDragon
fd6b5a6d5a Fixes Consciousness Transfer potions not working on basic mobs (#30570) 2025-09-28 16:31:43 +00:00
kyunkyunkyun
8b0c249d97 Fixes some laser guns inhands (#30445)
* fix inhands

* explanation
2025-09-27 08:48:00 +00:00
Vladislav Mikhalko
4cc861fb10 Anchor labor consoles by default. (#30422) 2025-09-27 08:46:26 +00:00
PollardTheDragon
659aae3562 Fixes generic spent shells being in clogged disposals events (#30559) 2025-09-27 02:55:42 +00:00
iramoye
badd102bef Reworks (almost) every language description (#30429)
* redoes all the languages

* second pass; capitalizes species names and does a bit of wording

* addresses complaints

* third pass

* Adds Trinary's honorifics

As far as I know, it's the only language that has them. They felt important enough to share.

Signed-off-by: iramoye <projecteternal1@gmail.com>

* Updates Trinary to use 'noun' 

These modifiers all, reasonably, can be applied to objects and places.

Signed-off-by: iramoye <projecteternal1@gmail.com>

* Update code/modules/mob/language.dm

HEADCODER YES HEADCODER

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: iramoye <projecteternal1@gmail.com>

* initial commit

* Revert "initial commit"

This reverts commit cbc60ec16a.

---------

Signed-off-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-09-26 17:18:58 +00:00
Alan
99d0494e2e Add mention of alt-click lock/unlock shortcut to APC and Air Alarm descriptions. (#30420) 2025-09-26 08:27:27 +00:00
CRUNCH
c6685eb21a The Silicon Ultimate PDA Golden Duluxe Edition DLC — Allows Silicons to Directly Access Their PDAs Because Verbs SUCK! (#30472)
* perfection

* drones

* Apply suggestions from code review

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

* apply suggestions from code review

* Update ai_hud.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-09-26 08:19:32 +00:00
Paul
350f0e4d0d Add fake wizard outfit to loadout (#30489)
* add wizard outfit to loadout

* fix linter
2025-09-25 05:06:02 +00:00
Seren Highwater.
7f89e1ba2d done (#30487) 2025-09-25 05:05:22 +00:00
PollardTheDragon
6fdacb21e0 Fixes hand interaction with kinetic assembler (#30463) 2025-09-24 17:59:35 +00:00
warriorstar-orion
11b516857d clean up logs for mob spawns (#30514) 2025-09-24 17:51:43 +00:00
PollardTheDragon
70537312ba Smith machines now drop their contained components on destroy (#30462)
* Smith machines now drop their contained components on destroy

* Update casting_basin.dm
2025-09-24 16:54:04 +00:00
Ahzpy
c27b1eb3a9 Adds Chef Related Plants To Seed Crates (#30396)
* Update pack_organic.dm

* forgot comma

* re-adds cotton and sunflower
2025-09-24 13:23:36 +00:00
kyunkyunkyun
b53cd96c8c fix (#30452) 2025-09-24 13:16:59 +00:00
Alan
24cb606061 Add neckwear to the event outfit manager. (#30474) 2025-09-24 13:12:34 +00:00
kyunkyunkyun
99626b8121 fix (#30456) 2025-09-24 13:05:41 +00:00
warriorstar-orion
3e39dae7ff fix mouse squeak (#30528) 2025-09-22 20:43:47 +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
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
8c98c9e0a5 Update robotic_brain.dm (#30404) 2025-09-19 14:39:44 +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
PollardTheDragon
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
PollardTheDragon
e3725f7452 Fixes issue with basic mobs and xenos attacks (#30492) 2025-09-19 03:08:06 +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
warriorstar-orion
d57f7f70b6 refactor economic news events, add more trade destinations (#30355)
* refactor economic news events, add more trade destinations

* Update code/modules/economy/economy_events/economy_event.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-09-18 06:14:12 +00:00
Chap
1bf1313375 You no longer attack yourself when you don't have enough fuel left in your welding tank to repair (#30352)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2025-09-18 06:12:49 +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
Alan
6e699e96cb Add better-fitting eyewear for monitor heads. (#30197)
* Add better-fitting eyewear for monitor heads.

* Incorporate linter feedback.

* Defluff

* Nudge side view monitor glasses to sit to the front of the screen.
2025-09-18 06:09:27 +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
Alan
b8d3c11c44 Fix cluwne sprites (#30015)
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* Fix cluwne sprites for several species. Fixes #13660

* plasmemes

* fix

* Adjust Kidan mask based on mandible feedback.

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* Bring up to date with master pt 2

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: kyunkyunkyun <maxkrutoda0@gmail.com>
2025-09-18 06:08:55 +00:00
PollardTheDragon
da46d7ce03 [s] Fixes video camera exploit (#30480)
* Fixes-video-camera-exploit

* Fixes issue with basic mobs and xenos attacks

* Revert "Fixes issue with basic mobs and xenos attacks"

This reverts commit b84d3144ae.
2025-09-18 06:00:42 +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
Seren Highwater.
3fd8db9e79 Updates the Cord variant of the Holobadge's sprite. (#30285)
* add kidan neck

* add sprites

* dfsgdf

* FORGOT THE CONFIG

* fix?

* fix???

* commas

* comma 2

* line fix
2025-09-16 18:52:22 +00:00