tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,316 Commits 3 Branches 5 Tags
a8d5e08d6950d131f5ea005686c6bf79f3e0f68c
Commit Graph

30316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Errant
7bf09bfdb5 add altered silicon to rules (#35455) 
* add altered silicon to rules

* skreee

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
 2025-03-02 20:41:07 +01:00
SlamBamActionman
08cb26dbf0 Hotfix: Fix uplinks allowing buying conditionally restricted items (#35334) 
* Initial commit

* I just compressed the code

* Actually address review
 2025-03-02 20:40:57 +01:00
PJBot
469bb1a9ec Automatic changelog update 2025-03-02 15:51:20 +00:00
slarticodefast
ceff2bea00 Cloning Refactor and bugfixes (#35555) 
* cloning refactor

* cleanup and fixes

* don't pick from 0

* give dwarves the correct species

* fix dna and bloodstream reagent data cloning

* don't copy helmets

* be less redundant
 2025-03-02 16:50:12 +01:00
Myra
02d3595faa Stable merge (#35620) 2025-03-02 13:58:59 +01:00
PJBot
ce7bb813d2 Automatic changelog update 2025-03-02 12:56:18 +00:00
Myra
51754f09ce #32209 changelog (#35619) 
Since it was merged into staging no changelog was made, but we should at least have it for next release. (And vulture)
 2025-03-02 13:55:10 +01:00
Myra
98cca7b0f8 Change Phalanximine to be more complex, increase Arithrazine damage (#32209) 2025-03-02 13:47:11 +01:00
PJBot
7ea586cc1c Automatic changelog update 2025-03-02 02:49:00 +00:00
metalgearsloth
a8ebcac5c9 Predict vending machine UI (#33412) 2025-03-02 13:47:52 +11:00
PJBot
ba1504d0d6 Automatic changelog update 2025-03-02 02:31:03 +00:00
metalgearsloth
d9e86b3e81 Revert "Make radioactive material radioactive" (#35330) 2025-03-02 13:29:54 +11:00
deltanedas
66e926843f fix cluwne pda pen slot (#35611) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-03-02 00:33:24 +01:00
Ed
0563e0d67e Reagent guidebook reactions UI dividers (#35608) 
* Update GuideReagentReaction.xaml

* Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
 2025-03-01 16:21:33 -06:00
hivehum
a926c53979 Give the station map inhand sprites (#35605) 
map has inhands
 2025-03-01 21:31:44 +01:00
PJBot
bb0c4c66fa Automatic changelog update 2025-03-01 20:26:00 +00:00
SlamBamActionman
9c970d203d Remove cellular resistance for slimes (#35583) 
* Remove cellular resistance for slimes

* Update guidebook
 2025-03-01 21:24:54 +01:00
ScarKy0
a54960eb81 Fingerprint Reader System (#35600) 
* init

* public api

* stuff

* weh
 2025-03-01 10:41:37 -08:00
PJBot
5bdc93b102 Automatic changelog update 2025-03-01 18:04:34 +00:00
ArtisticRoomba
deea33a36a DetGadget Hat Revitalization (#35438) 
* DetGadget Hat

* uh... half-assed item description

* Reduce hat range to one tile, you have to stand on someone to steal their hat items

* Fix Integration Errors

* Only the wearer can access voice commands

* init work - handscomp is unable to be pulled

* second bit of progress

* basic working implementation

* nuke storageslots and add adminlogging

* disallow trolling nukies or hiding objective items

* remove unnecessary tags additions

* finish nuking unused tags

* death to yamllinter

* int tests be damned

* milon is a furry

* address review

* upd desc

* address reviews part 2

* address more reviews

* remove unused refs

* fix order of dependencies

* add ShowVerb to SharedStorageSystem.cs

This will allow or disallow showing the "Open Storage" verb if defined on the component.

* orks is a nerd

* add proper locale, fix adminlogging

* orks is a nerd 2

---------

Co-authored-by: Coenx-flex <coengmurray@gmail.com>
 2025-03-01 19:03:27 +01:00
chromiumboy
10c868011e Sentry turrets - Part 3: Turret AI (#35058) 
* Initial commit

* Updated Access/command.yml

* Fix for Access/AccessLevelPrototype.cs

* Added silicon access levels to admin items

* Included self-recharging battery changes

* Revert "Included self-recharging battery changes"

* Addressed reviewers comments

* Additional reviewer comments
 2025-03-01 18:42:33 +01:00
FungiFellow
e8c812f90f Changed Pride to Hubris in ion_storm.yml (#35602) 
Update ion_storm.yml
 2025-03-01 18:19:19 +01:00
PJBot
212e942d21 Automatic changelog update 2025-03-01 14:09:40 +00:00
ScarKy0
5169ad4e8f Fix being able to write on/stamp/fax paper scrap (#35596) 
* init

* item

* requested changes

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-01 15:08:34 +01:00
PJBot
e540f9cd50 Automatic changelog update 2025-03-01 09:57:36 +00:00
LaCumbiaDelCoronavirus
aa05cbb49b make slime hair less transparent (#35158) 
* blabl blump or something

* +0.3

* blimpuf
 2025-03-01 20:56:29 +11:00
Errant
1b20121114 Increase line spacing of the admin overlay (#35591) 
line spacing
 2025-03-01 03:17:07 +01:00
PJBot
6b84315928 Automatic changelog update 2025-03-01 02:13:31 +00:00
Velken
30a6ebdb26 Wizard PDA (#35572) 
* wizard PDA

* colour change to brown
 2025-03-01 03:12:24 +01:00
PJBot
01e4029a11 Automatic changelog update 2025-02-28 20:52:39 +00:00
Schrödinger
8ea888d821 [ADMIN] Minor Refactor AdminNameOverlay (#35520) 
* refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player

* fix(src): Add configure classic admin owerlay

* fix

* tweak(src): Use _antagLabelClassic and tweak style

* tweak(src): Add config display overlay for startingJob and playTime

* tweak(src): Vector2 is replaced by var

* tweak(src): return to the end of the list
 2025-02-28 21:51:30 +01:00
Southbridge
0c6db4db18 Amber Station - A Couple Changes (#35548) 2025-02-27 23:48:18 -07:00
Pancake
4442d5e277 Unheck Admin Smites (#35348) 
* Fix admin verb names

Fixed admin verb names.

* Add antag verb names

* Adjust antag verb icons
 2025-02-28 01:05:34 +01:00
PJBot
d8838e31d5 Automatic changelog update 2025-02-27 23:37:00 +00:00
Smith
38d72434fb Reptilians Can Eat Chicken Nuggets (#35569) 
Added meat tag to misc.yml for chicken nuggets.
 2025-02-28 00:35:52 +01:00
Smith
6b6ac9ac53 Doxarubixadone Description Fix (#35568) 
Changed medicine.ftl for Doxa.
 2025-02-28 00:18:36 +01:00
SlamBamActionman
1047e32944 Add new implants to deimplant list (#35563) 
Initial commit
 2025-02-27 20:23:59 +01:00
ActiveMammmoth
cec05d697e Staff of Animation Fixes (#35491) 
* staff of animation fixes and system

* requested changes

* size back to normal

* Update AnimateSpellSystem.cs

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-02-27 20:11:57 +01:00
slarticodefast
3c20f63292 fix subwizard gamerule (#35562) 2025-02-27 14:01:20 -05:00
PJBot
439e1c6dc0 Automatic changelog update 2025-02-27 17:58:34 +00:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136) 
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
 2025-02-27 18:57:28 +01:00
PJBot
5fdf702e3c Automatic changelog update 2025-02-27 17:45:02 +00:00
SlamBamActionman
c7b9a76342 Prevent crates, pet carriers and other things from going into disposals (#35557) 
* Initial commit

* Solve underlying bug, readd to disposals

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-27 18:43:56 +01:00
PJBot
19c23682b0 Automatic changelog update 2025-02-27 17:26:20 +00:00
Aisu9
2db57f11ac Sap-Syrup balance (#32996) 
Sap-Pancake balance

Change the conversion rate from 12:1 to 2:1
 2025-02-27 09:25:12 -08:00
PJBot
3f014d2b77 Automatic changelog update 2025-02-27 13:48:23 +00:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255) 
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-02-27 14:47:16 +01:00
PJBot
4d0e63caeb Automatic changelog update 2025-02-27 12:45:17 +00:00
āda
f80f305d1d Add filters to uniform printer (#34316) 
* uniform

* missing category

* lint

* bedsheets

* carpets

* typo

* indent
 2025-02-27 13:44:10 +01:00
PJBot
e705d04a12 Automatic changelog update 2025-02-27 12:41:05 +00:00