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

4641 commits

Author SHA1 Message Date
Morb0
d135aabdcd Use corvax admin icons 2023-09-13 17:05:55 +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
DrSmugleaf
f23228bda9
Update dragon devour action icon (#20020) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-12 22:05:04 -07:00
deltanedas
486bba4565
prevent mice going under secret doors (#20057) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 18:20:47 -07:00
deltanedas
1986ca86f4
make hardbombs indestructible (#20073) 
* make hardbombs not explode when destroyed

* actually just remove it entirely

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 11:29:50 -07:00
Aru Moon
f614029f64
remove useless file from prototypes (#20066) 2023-09-12 09:21:38 -05:00
metalgearsloth
7064f262b4
Add ore bag area pickups (#19358) 2023-09-12 22:34:04 +10: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
chromiumboy
c853f0bfb7
Artifact containers can safely store radioactive objects (version 2) (#19652) 
* Artifact containers suppress the radioactive of artifacts inside them

* Updated to reflect changes to RobustToolbox

* Made necessary changes after updating RT

* Removed test code

* Made requested change

* Updated due to changes to RobustToolbox

* Renamed function

* Updated to accommodate changes to RobustToolbox

* Actually resolve merge conflict?

* Removed unnecessary change

* Made requested changes

* retrigger checks

* Retrigger checks

---------

Co-authored-by: root <root@DESKTOP-HJPF29C>
 2023-09-11 15:58:25 -04:00
lzk
5ca34e5578
crayon.yml cleaning (#20029) 2023-09-11 15:52:54 -04:00
metalgearsloth
a75745491d
Make some more machines snapCardinals (#19781) 2023-09-11 22:56:53 +10: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
d5bd1c6f86
Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
drteaspoon420
a7ac4a83c4
Changed produce spills into dynamic from hardcoded. (#19980) 2023-09-11 01:16:26 -07:00
metalgearsloth
28bf3a6240
Remove SharedEye (but content) (#19481) 2023-09-11 16:15:23 +10:00
Kara
64a29f0d8a
InAir tweaks & chasm fixes (#19707) 2023-09-11 16:03:16 +10:00
Morb
2a143c873c
SSD Indicator (#19701) 2023-09-11 15:52:56 +10:00
Vasilis
1a7d3d945e
Nerf paramed PDA scanning speed and buff all others to be the same (#19983) 
* Match scantime with peramed for cmo

* Nerf, the webedit

* All pda times are same now uwu
 2023-09-10 16:01:05 -07:00
deltanedas
6953070d40
ninja bombing target whitelist warp point (#19977) 
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:04:00 -06:00
deltanedas
24810d916b
ninja 2 electric boogaloo (#15534) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:20:27 +10:00
Flareguy
8d69f7f2eb
Cobwebs (#19623) 
* adds cobwebs

* like legit the most awesomest thing ever
 2023-09-09 23:37:56 -04:00
deltanedas
5dbf79f7da
ian crafting (#19821) 2023-09-09 23:04:32 -04:00
deltanedas
152a1d1e75
Make monkeys better (#19407) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 12:51:51 +10:00
lzk
e1d54e360f
ways to get a plush moth (#19843) 
* to arcades

* plushie toys crate

* hampter in arcade
 2023-09-09 12:58:42 -06:00
csqrb
e773d8c09f
Increase crayon charges from 5 to 15 (#19922) 2023-09-09 10:45:38 -08:00
lzk
79b9ec8675
Update paper.yml (#19943) 2023-09-09 12:45:14 -06:00
deltanedas
2c72032c30
Buff gauze (#19909) 2023-09-09 10:32:00 -08:00
Vasilis
16943ff857
Aghost have syndicate access (#19948) 2023-09-10 03:58:37 +10:00
Vasilis
d637ad0e21
no more (#19949) 2023-09-09 11:29:31 -04:00
SonicHDC
6e0466fb25
Bench and fixes (#19748) 
* Bench Proto

* Bench sprites

* Update meta.json

* Grammatic fixes

* Update meta.json

* Add files via upload

* Delete Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench-overlay.png

* Meta

* Spaces

Final changes in git web

* Directions fix

Bar and stool fixes

* Final proto fixes

* Physics

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-09-09 08:56:10 -04:00
Nairod
25569e2f87
Mime Wall Nerf (#19925) 2023-09-09 15:40:11 +10:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
potato1234_x
5945c20fdc
no more f toast (#19905) 2023-09-07 23:37:52 -07:00
Kevin Zheng
442cc7f659
Switch security techfab to produce magazines (#19769) 
* Switch security techfab to produce magazines

* Add back ammo boxes
 2023-09-07 19:16:19 -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
deltanedas
7e77720f01
Scale radiation intensity with stack size (#19869) 2023-09-07 13:59:08 -08:00
liltenhead
005e89c352
Increase hardhat light radius (#19867) 2023-09-07 10:38:57 -08:00
Vasilis
2446c6a37b
Hypo can inject solutions back into beakers (#19877) 
* Inject to beakers

* Stop fighting in my pr

* Review
 2023-09-07 09:49:02 -07:00
Velcroboy
1de23dc4d0
Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
metalgearsloth
b25862365e
Revert click damage mod (#19860) 
Maybe swings should be default and we make the animation not shit and the prediction slightly better.
 2023-09-06 03:30:23 -05:00
lzk
8437038fd4
Adjust red glow stick glow duration (#19857) 2023-09-05 12:16:54 -08:00
deltanedas
6d5c310b36
Make constructed hydro trays start empty (#19620) 2023-09-05 12:15:06 -08:00
daerSeebaer
048c7f8e04
Add atmos door to spray painter (#19852) 2023-09-05 09:46:30 -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
DrSmugleaf
0527d2e719
Fix barriers not working (#19774) 2023-09-04 15:33:40 -07: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
Fromoriss
b50e5651a1
Add moth plushie (#19828) 
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
 2023-09-04 13:18:03 -07:00
PixelTK
74bd86af2f
Arachnid RE-REWORK (#19138) 
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
 2023-09-04 13:02:54 -07:00
lzk
33cdcf34dd
NPC/silicon.yml cleaning (#19731) 2023-09-05 00:21:52 +10:00