juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,634 Commits 57 Branches 0 Tags
bdcdb6e338c4de732b41f56fef3edf07d032ae2f
Commit Graph

2803 Commits

Author SHA1 Message Date
August Sun
bdcdb6e338 Adds the Estoc DMR to the syndicate uplink (#38122) 
* Initial commit, adds the prototype, sprites and attributions, entries into syndicate uplink for weapon bundle and magazines

* Reduced weapon spread when wielded

* minor visual updates to sprites

* slightly adjusted burst rate down

* Update duffelbag.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
 2025-06-16 17:20:08 -07:00
ArtisticRoomba
3eba895fc7 Thieves can innately pickpocket - thieving gloves rework (#38123) 
* Thieves can innately pickpocket (#107)

Pickpocketing a skyrim guard's armor off

(cherry picked from commit 21b9f1ddb251ea3c7c6803e78871abefcaecbfb4)

* this isnt moff

* Make predicted, cleanup

* !skating-basketball

* orks are NOT the best trollface

* Implement much more sensible component replication prevention

---------

Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com>
 2025-06-16 15:47:31 -07:00
ScarKy0
4cc6cb95dc Commands for adding and removing actions (#38317) 2025-06-16 13:25:44 +03:00
Helix-ctrl
1d4cf48c31 Add hints towards flash protection to all items which provide it (#37267) 
* Update welding.yml

* Update FlashSystem.cs

Add subscriber event for flash immunity examine text

* Create flash-immunity-component.ftl

* Removed changed description text

* change to use entity version

* fixed mistake
 2025-06-15 18:38:36 -04:00
SlamBamActionman
9af0b354e3 Exo Station - Upstream Playtest Version (#33144) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-06-15 12:10:22 -07:00
ScarKy0
208b245dcb Retractable items system + Arm Blade action (#38150) 2025-06-14 21:29:06 +03:00
Sparlight
937326460f Add pet bag - wearable backpack for pets (#37440) 
* Add pet bag

* Trailing whitespace moment

* make the linter happy

* Fix trailing whitespace concern.

* Fix Construction component oopsy-daisy

* yml guideline moment

* remove weird extra whitespace

* make the maintainer happy

* Adjusted bag visuals based on feedback

* Allow the fox aghost admin to use pet bags
 2025-06-14 09:09:05 -07:00
Sparlight
67c8d1db87 Add corgium (#37951) 
* Add corgi essence

* Adjust spacing concerns

* Renamed 'corgi essence' to 'corgium' based on maintainer discussion
 2025-06-14 11:07:48 +02:00
qrwas
757ef3c62b fix missing locale for Undergarment (#38304) 2025-06-13 12:09:30 -04:00
SyaoranFox
72b57392d1 Rat King changed to Antag (#38124) 
* Changed rat king to be antag
Rat King guide updated to show antag rules

Initial infected given zombie faction
Zombies given zombie faction too (not sure if redundant or not)

* Given zombie faction to Initial Infected and Zombies in mind_roles

* Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist

removed components from antag listings

* Removed changes for zombies

* Update Resources/Prototypes/Roles/Antags/zombie.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Update Resources/Prototypes/ai_factions.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Changed mob prototype to match

* Forgot solo again

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2025-06-13 17:52:19 +02:00
hoshizora
0b161cba6b Fix crafting steps with modular machine parts (#38299) 
fixed lines that were messing with construction menu entries for machine parts
 2025-06-12 22:21:57 -07:00
Boaz1111
55540c374a scar availability for more species (#35645) 
* :D

* updated for new scars

* small eye scar
 2025-06-11 23:56:57 +02:00
āda
f5a28a5ad5 Cleanup exosuit fab recipes, add modules category (#38069) 2025-06-11 14:12:09 -07:00
Perry Fraser
36c048ba65 Add disambiguation to most construction menu recipe names (#38197) 2025-06-11 12:52:22 -07:00
Simon
f5fbef7ccc Add the instrument names to the MIDI channel selector (#38083) 
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
 2025-06-11 20:32:48 +02:00
eoineoineoin
419b4e7916 Add technology to tech disk names (#38157) 2025-06-11 03:15:56 +02:00
Tayrtahn
3dbb8905b5 Add test that entity prototypes don't use LocIds for name/description (#38234) 
* Add test that entity prototypes don't use LocIds for name/description

* Fix violation
 2025-06-11 02:47:04 +02:00
lzk
3a4b7d62c7 WHYYYYYYY (cleanup) (#38220) 
* WHYYYYYYYY

* Delete Resources/Locale/en-US/actions/actions/rootable.ftl
 2025-06-10 15:36:58 +02:00
qrwas
ca6ab02587 Add missing locale in Criminal Records Computer (#38217) 
add missing filter locale
 2025-06-10 14:19:37 +02:00
Tayrtahn
f8e89749c5 Give unique names to all curtain construction recipes (#38182) 
* Give unique names to all curtain construction recipes

* Duplicate entry
 2025-06-09 19:55:44 +02:00
Orsoniks
ef42c36cdb Improved Health examination text (#38126) 
* more health examinations

* better blood

* fix

* tweaks

* sizeable

* silicon fix

* tweaks

* bleeding color tweaks

* fix
 2025-06-09 00:31:49 -07:00
Kyle Tyo
546bfd0a30 MapManager warnings cleanup Server Edition 2003 (#36781) 
* now you see me

* unused depen

* test fail fix attempt 1

* test fail fix attempt 2

* fix test fail attempt 3

* shot in the dark.

* Does this work?

* import cleanup

* taking a shot at this.

* Convert PersistenceSaveCommand to LocalizedEntityCommands.

* requested changes

* requested changes. also dealt with improperly named private const

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Convert PlanetCommand to LocalizedEntityCommand

* Update BiomeSystem.cs

* Update Content.Server/Salvage/SalvageSystem.Runner.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Procedural/DungeonSystem.Rooms.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Station/Systems/StationBiomeSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* revert to latest master.

* slartis suggestion.

* Update SetMapAtmosCommand.cs

* cleanup

* Update PersistenceSaveCommand.cs

* finish localizing persistencesavecommand

* this is icky, I change.

* :sigh:

* revert whatever I did here?

* oh I see, some inconsistencies.

* revert this

* Update PlanetCommand.cs

* move this ftl to the commands folder

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-06-09 02:09:42 +02:00
Kyle Tyo
5707a31cac ShowEmergencyShuttleCommand and MeleeSpreadCommand LEC conversion. (#37993) 
progress
 2025-06-06 20:28:00 -04:00
RedBookcase
219015dcd8 Added Scrap Armor [Reupload]. (#37601) 
* Added Scrap Armor v2.

* Added a note to scrap helmet about vision reduction.

* Removed protection from step triggers.

* The patient needs broken kneecaps to live.

* Add in missing tag

* Missing tags pt 2

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-05 20:13:36 -04:00
August Sun
f9784206e0 Adds individual Bulldog magazines to the syndicate uplink (#37917) 
* Brief commit to update branch

* added more magazines to uplink, corrected spelling in ftl file for uplink, corrected sprite state for incendiary bulldog mag

* removed incendiary drum, increased cost of slug drum

* Emogarbage swoop

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-05 19:35:15 -04:00
Kyle Tyo
db38a9c945 Revise ShowAccessReadersCommand as LocalizedEntityCommands (#37991) 
* revise ShowAccessReadersCommand

* don't believe this is needed anymore? hopefully servers world wide don't explode.
 2025-06-05 19:17:31 -04:00
SlamBamActionman
d81e82cef7 Add Diona rooting (#32782) 
* Initial commit

* Add sound

* Review commets

* addressing review

* I think this is what Slart meant?

* Review fixes

* More fixes

* tiny formatting

* Review fixes

* Review fixes

* Fix small timing error

* Follow new action system

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-06-04 12:52:59 +02:00
vitopigno
f8d0b0cba3 Add text highlighting (#31442) 
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Hans Larsson <hanandlia@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
 2025-06-04 12:12:37 +02:00
Moomoobeef
2184d38460 Stylized the nanotask printouts to be *pretty* (#37805) 2025-06-04 01:16:14 -07:00
Ciarán Walsh
d83f393fa4 Use distinct action labels for toggling internals on and off. (#36073) 
* Use distinct action labels for toggling internals on and off.

* Implement specific actions for enabling/disabling internals

Avoids potential confusing race conditions where two people might perform the "Toggle Internals On" action an the same person,
which would have jsut toggled twice.

* If no gas tank, will give popup

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-06-02 13:09:45 +02:00
chromiumboy
45012cbe1d Layering for atmospheric pipes (#36124) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2025-06-01 22:01:43 -07:00
TheFlyingSentry
4a378bd8dc Adding a new trait: Monochromacy! (#37989) 
Totally not misspelt necromancy

Co-authored-by: TheFlyingSentry <Daniel.l.Elledge@gmail.com>
 2025-06-01 07:31:46 +02:00
āda
cf9aa579ad Add a missing ftl to AI turrets (#37965) 
* missing ftl

* make it pop
 2025-05-30 19:15:46 -04:00
ArtisticRoomba
c4c528035b Show TEG theoretical supply on inspect (#37957) 
* Show TEG theoretical supply on inspect

* revert autoformatting changes
 2025-05-30 16:41:30 -05:00
Alpaccalypse
0df4a2e243 Absinthe makes you mildly hallucinate (#34371) 
* Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick.

* Reordered glass fill sprites to look more equal
 2025-05-30 18:03:49 +02:00
āda
a89de7ce17 Add filters to cutter machine (#34321) 
* tiles

* lint

* categories

* blank line

* small base recipe change

* indent

* reorginize
 2025-05-30 17:19:57 +02:00
beck-thompson
05fac53de6 Chameleon controller implant (Clothing fast switch) (#33887) 
* Add the chameleon controller implant

* address the issues (Git please dont kill me)

* Address the review and fix some merge conflicts!

* Cleanup

* Add use delay

* Silly mistakes

* Making a PR at 2 am: Gone wrong

* Predict use delay and disable the buttons until you can choose another

* First phase custom clothing

* Better system, now relays to agent id and mindshield. Chameleon loadouts are a lot better to work with as well

* Address the review! No more evil goto

* Slams way is better I should have read more closely xD

* Some of the jobs

* Add to Cargo, CentComm, Service, Passenger, Ninja, Cluwne, Wizard + Minor changes to existing; Add chameleon to bandanas, medals, jugsuits and HUDs

* Add everything else

* Fix test

* Job name

* This looks better

* Add department organization

* Minor cleanup

* Added some mindshields

* Remove redudent comment and change funcion name to be clearer

* Fix cluwne outfit

* fix merge conflicts

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-05-30 12:07:25 +02:00
Nox
b2f5b27579 Fixed nukie corpsman antag name (#37933) 
Fixed

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
 2025-05-29 23:12:31 +02:00
PicklOH
3365e97895 Restore Gas Pipe Naming in Construction Menu (#37881) 
restore gas pipe naming in construction menu
 2025-05-27 18:26:30 +02:00
Simon
2bbe66cea9 Remove capacitors and matter bins (#37725) 
* Remove capacitors and matter bins

* fix migrations and yaml errors, remove parts fully

* Rename to "modular machine part"

* Sloth review
 2025-05-27 21:47:49 +10:00
Myra
df2c2adc9d Stable master merge (#37850) 2025-05-26 17:30:30 +02:00
Errant
02fe5b4ac5 HOTFIX Cryochem revert (#37844) 
* Revert "Traumoxadone (#37236)"

This reverts commit 55ec2632a8.

* Revert "Cryoxadone Tweaks (#37132)"

This reverts commit 406bfa3308.

* Revert "Stelloxadone (#37131)"

This reverts commit f415ad51c3.

* whitespace test fail evasive maneuver

* changelog 1984
 2025-05-26 16:49:34 +02:00
chromiumboy
f99850e1fb Sentry turrets - Part 6: Sentry turret control panels (#35235) 2025-05-26 16:00:50 +03:00
slarticodefast
e8bc811f7a Add WieldingBlockerComponent (#37778) 
initial commit
 2025-05-25 23:50:30 -04:00
Simon
7867cbec00 Add basic discord client integration with ooc and admin chat support (#33840) 
* Add basic discord client integration with ooc and admin chat support

* Use username instead of global name

WHY IS GLOBAL NAME NOT JUST THE USERNAME??? WHY ARE THERE NO DOC COMMENTS???

* stuff

* Reviews, methinks.

* Reviews

* reviews
 2025-05-24 20:49:52 +02:00
Wolfkey-SomeoneElseTookMyUsername
e72e25aba1 Add disposal signalers (#37535) 
* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller
 2025-05-21 22:18:57 -04:00
ScarKy0
572b20464c Tweak "Help a fellow traitor" objective to allow yellowtexting (#37679) 
init
 2025-05-21 16:45:34 -04:00
Leon Friedrich
38d7949777 Add microwave-nukedisk interaction (#36114) 
* Add microwave-nukedisk interaction

* popup

* Fix UninitializedSaveTest
 2025-05-21 11:06:58 -07:00
ArtisticRoomba
3d5534199e fix soil locale (#37674) 
* fix soil locale

* xdd
 2025-05-20 23:36:06 -07:00
B_Kirill
f07b2aa6c3 New fun meteors (#37327) 
* New fun meteors

* Forgot about newline

* Fix

* Wow, a new test

* Okay

* Fix

* Fix 2

* I hope this is correct enough

* Attribution

* Attribution 2
 2025-05-20 23:04:27 +10:00