NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-12 03:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
21874 commits 14 branches 0 tags 2.9 GiB
Commit graph

2369 commits

Author SHA1 Message Date
Morb0
e92205e9b8 Fix locale 2023-09-13 20:10:00 +03:00
Morb0
0b7a36e623 Update locale 2023-09-13 17:24:31 +03:00
Morb0
e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
 2023-09-13 16:51:52 +03:00
mhamster
0d18f83949
Chemical things machine boards translation fixes (#1405) 2023-09-13 08:05:45 +03:00
JoeHammad1844
3401709e84
Nukies get free microbomb (#20012) 2023-09-12 08:09:32 -07:00
lapatison
92bbc86b86
Fix admin-notes.ftl (#1407) 2023-09-12 14:20:03 +03:00
eclips_e
133ca98655
Hardbombs & Defusables (#15380) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
 2023-09-11 18:42:38 -07:00
DrSmugleaf
a272cd4439
Remove manual localization from action entity prototypes (#20023) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-11 22:34:41 +10:00
metalgearsloth
b77265314b
Make role timer tooltips pretty (#19605) 
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
 2023-09-11 15:44:21 +10:00
deltanedas
24810d916b
ninja 2 electric boogaloo (#15534) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:20:27 +10:00
Emisse
ca289d4f0b
Revert "Semi revert glass tile resprite (#19266)" (#19931) 
This reverts commit 38f921f831.
 2023-09-09 00:33:22 -06:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
deltanedas
64f2efbb55
move advanced laser gun into t3 lasers tech (#19875) 
* move advanced laser gun into t2 lasers tech

* t3 and troll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-07 19:25:04 -07:00
deltanedas
db2a4478b0
show non-sheet material units in lathe (#19896) 
* locale for material units

* use material units in lathe ui

* give units to non-sheet materials

* :trollface:

* use volume properly

* :trollface:

* review

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-07 22:11:10 -04:00
Doru991
1c6d723515
Syndie airlocks (#19264) 
* Add regular syndie access level

* Localize that

* Syndie airlock textures

* Yaml work

* guh

* Real

* Eated a word

* Just one more commit

* The game didn't complain about that one

* Make agent id have working agent access

* Change color scheme and palette

* Glass too because why not

* Nukie agent ID workaround
 2023-09-07 19:19:56 -04:00
lapatison
8d3a741325
Guidebook locale (#1393) 2023-09-07 16:07:33 +03:00
potato1234_x
38f921f831
Semi revert glass tile resprite (#19266) 2023-09-06 14:41:53 -07:00
lapatison
4b2dc90986
Translate Upstream #1387 (#1391) 2023-09-06 21:52:02 +03:00
lapatison
fee2a583a6
Locale fixes (#1386) 2023-09-06 16:21:56 +03:00
Slava0135
81388f77ed
Add gas tank valve (#19830) 2023-09-05 09:20:05 -08:00
EnDecc
9c8e86e252
The Quartermaster Hardsuit (#19738) 
* added Quartermaster hardsuit, and cargo order for it

* always some pocket lint

* DNM comments to relevant spots

* renames

* more renames, also pirate crate because gold luxury something something

* plus one id
 2023-09-04 20:42:09 -07:00
Kevin Zheng
a251708ac9
Fix copy/paste error (#19836) 2023-09-04 20:29:43 -04:00
Morb0
7f1034586d Update locale 2023-09-05 01:01:04 +03:00
Morb0
b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
 2023-09-05 00:12:02 +03:00
chromiumboy
05e9d2e33a
Plasma fueled radiation collectors (#19598) 
* Fixes issue with solution regenerators

* Update Solution.cs

Removed excess whitespace

* Undid file scoping to make this easier to review

* Initial prototype

* Adjusted coefficients

* Removed unintentional changes from another PR

* Undid unintentional change

* Undid unintentional change

* Added temperature modifier to power production

* Guidebook entry and radiation collector low pressure warning

* Reviewer requested changes
 2023-09-04 16:11:57 +03:00
deltanedas
d8effa6150
carpsuit and iansuit revival (#19728) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 22:16:36 -07:00
deltanedas
b3f66fff40
decouple objectives round end text from traitor (#19687) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 21:55:34 -07:00
Nemanja
445ed9e9d5
argocytes (#19801) 2023-09-03 22:02:00 -04:00
Kevin Zheng
4c73c8d3ef
Change "Battery Power" to "Load" for APCs (#19766) 2023-09-03 10:24:24 -04:00
faint
646869afa7
Update botany-crates.ftl (#19746) 2023-09-02 11:11:00 -04:00
potato1234_x
25d4a26c8e
More Petting Sounds and Popups (#19686) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-09-02 15:54:05 +10:00
IProduceWidgets
bc00a635b9
Makes Plant-B-Gone available to cargo, and Diona vulnerable. (#19555) 
* Adds WeekKiller storage tanks and allows Cargo to purchase them.

* Delete CellMemberRoll.cs

Woops, this template file snuck in after I reset my local. It doesn't do anything, just empty classes.

* Switched from WeedKiller to PlantBeGone because WeedKiller is too deadly. Honestly is probably shouldn't be in Botany so readily.
Made Diona take damage from PlantBeGone and WeedKiller.
Adjusted waterguns to use less reagent per shot.
Added admeme watergun.
Adjusted watergun cargo crate.

* Fixing small .yml formatting hiccups.

* Fixing small .yml formatting.

* Fix Typo.

* watergun min solution match shot size

Makes watergun's minimum solution transfer match shot size (5u).

* I pass tests now, please?

Nothing.

* Lower Diona herbicide damages
Remove slime changes
Lower super water blaster size to 500u (100 shots)
 2023-09-01 22:32:08 -07:00
Varen
155f6a418f
Items will display size when examined. (#19703) 2023-09-02 01:09:58 +10:00
Tony
c764a40a69
Toggleable clothing changes (#19680) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-01 21:12:59 +10:00
Nemanja
6695ac2ad6
Show materials as sheets, tweak lathe ui (#19709) 2023-08-31 22:28:08 -07:00
Nairod
44b166788b
More Speech Verbs (#19626) 2023-08-31 20:15:31 -07:00
Kara
cd9ceb2378
Ice & snow tile modernization (#19689) 
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
 2023-08-31 15:31:23 -06:00
lapatison
838e0f2754
Translation 1984 quick-fix (#1383) 2023-09-01 00:30:17 +03:00
lapatison
40b52bff8f
Translate Upstream #1381 (#1382) 2023-09-01 00:21:29 +03:00
Thom
31282a3fc6
Adds Supplybot, a cargo-focused deliverybot with internal storage. (#19638) 2023-08-31 12:46:49 -07:00
Morb0
7cd700bd8a Update locale 2023-08-31 21:12:21 +03:00
Morb0
5a6058666e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/white_mono.png
 2023-08-31 20:55:00 +03:00
lapatison
8585afd148
Translate Upstream #1376 (#1378) 
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
 2023-08-31 20:51:47 +03:00
ike709
8877b8abf7
Fixes BYOND™ capitalization in deathmatch callouts (#19677) 2023-08-30 20:15:41 -06:00
ike709
c91c452054
Fixes an extremely important™ typo in deathmatch callouts (#19676) 2023-08-30 19:13:00 -07:00
Sailor
5fefd5b718
Turn dionas into trees if they overdose on robust too hard (#19451) 
* Add polymorph reactioneffect, make dionas polymorph into trees

* Actually they'll probably die before they get to 60 so there's that.

* Generalize effect loc

* Huh so that works

* Wow

* oh god the tabulation

* what

how

* Review

* Why did it happen again?!?!?!

* Parent adminhypo from an already existing one.

* Since were no longer checking protoname
 2023-08-30 22:01:56 -04:00
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2023-08-30 18:06:15 -07:00
mosleyos
ac09364cad
Translation of dwarf accent (#1285) 
Co-authored-by: KIBORG04 <bossmira4@gmail.com>
 2023-08-30 21:34:35 +03:00
lapatison
0d8097c4d1
New library book, "Busido" (#1306) 
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2023-08-30 21:32:01 +03:00
Morb0
33b3f2c38d Update locale 2023-08-30 21:00:22 +03:00