Commit graph

2040 commits

Author SHA1 Message Date
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
Morb
f9144496f7
Stair decals (#20080)
* wip

* done
2023-09-12 14:54:28 -06: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
Morb
2a143c873c
SSD Indicator (#19701) 2023-09-11 15:52:56 +10: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
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
SonicHDC
d69c5f8730
Reprise clothes on monkeys (#1286) 2023-09-09 12:26:34 +03:00
Ubaser
d7c9a2cb73
fix transparency (#19934) 2023-09-09 01:44:35 -06:00
Emisse
ca289d4f0b
Revert "Semi revert glass tile resprite (#19266)" (#19931)
This reverts commit 38f921f831.
2023-09-09 00:33:22 -06: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
lzk
d3f66ba611
New lobby art (#1389) 2023-09-07 16:09:35 +03:00
Velcroboy
1de23dc4d0
Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
potato1234_x
38f921f831
Semi revert glass tile resprite (#19266) 2023-09-06 14:41:53 -07:00
LinkUyx
9041d1a2df
[Resprite] Wallmed (#1354) 2023-09-06 16:24:20 +03:00
LinkUyx
c9f2719adc
[Resprite] Death squad helmet (#1380) 2023-09-06 16:23:09 +03: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
Morb0
b3f8db2b0c Add arachnid idle state for typing indicator 2023-09-05 01:23:47 +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
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
deltanedas
04cd014179
nuke lights code change (#19315)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-04 17:14:10 +03:00
deltanedas
d8effa6150
carpsuit and iansuit revival (#19728)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:16:36 -07:00
Nemanja
445ed9e9d5
argocytes (#19801) 2023-09-03 22:02:00 -04:00
FinnishPaladin
53637c9a39
Bartender aprons! (#19794)
* Adds a new apron to the bar clothing vendor.

* quick fix

* quick edits to the sprites

* another sprite edit.

* more tweaks...

* darkened sprites a bit, moved the apron's location in the bardrobe

* improved the item suffix
2023-09-03 17:27:19 -04:00
KingFroozy
5d4c8998ad
Chief Engineer's Turtleneck (#19737)
* Add chief engineer's turtleneck

* Printable now
2023-09-03 14:38:28 -04:00
lzk
2b3ddaa839
[Resprite] Taxibot (#19783)
* sprite

sory i haven't access to GitHub desktop

* meta
2023-09-03 10:31:24 -04:00
/ʊniɹɑː/
b52b063d6f
refactor checkerboard (#18359) 2023-09-03 16:16:09 +10:00
Nemanja
1282d3eb68
bloody microwaves (#19647) 2023-09-03 00:03:05 -04:00
Gotimanga
45c7cc4f5b
Hoods for Winter Coats (#19541)
* First few wintercoat hoods

* More Coat Hoods

* Cleaning up and organizing

* Maybe the coat hoods don't need their own YML file

* Tweaks and resprites

* licenses and removing pixels

* Final changes before PR

* Added sound, plus rearanging base hood

* Fixing changes I shouldn't have made while I was tired + adding custom action name

* Forgot to name the base wintercoat with hood

* Please fix the YAML test fail

* Changing a few pixels on the hoods

* Hopefully fixing testfail

* Test Fail Fix
2023-09-02 07:33:32 -07:00
ThunderBear2006
e4bc0e33c8
Signal Button Resprite (#18712)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-09-02 23:58:40 +10: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
Thom
31282a3fc6
Adds Supplybot, a cargo-focused deliverybot with internal storage. (#19638) 2023-08-31 12:46:49 -07: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
metalgearsloth
cf6b760910
Fix shader 2.0 (#19699) 2023-09-01 00:31:26 +10:00
metalgearsloth
e0f0879fce
Fix shader precision (#19695) 2023-08-31 23:26:39 +10:00
Leon Friedrich
102c6a441c
Tweak outline changes (#18599) 2023-08-30 21:23:36 -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
Flareguy
1b26a7f602
Slight monotile modification & raw sprites folder (#19613)
* slight steel tile fixes & raw sprites folder

* fuc
2023-08-30 19:02:35 -06: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
2968d856bf Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-08-30 20:42:46 +03:00
metalgearsloth
460ecebbe4
Make shader bool constant (#19660) 2023-08-30 22:28:59 +10:00
Morb
c99e365ce7
Give nukies the ability to declare war for a TC boost (#19291)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-29 23:56:20 -08:00
metalgearsloth
cae574cbda
Add tile entity occlusion (#14626) 2023-08-30 12:32:35 +10:00
Flareguy
5b9ed564d5
ports shiptest's chair sprites (with paradise's palette) (#19645) 2023-08-29 17:32:32 -06:00
Nemanja
f4503864d5
Concrete and asphalt tiles (#19642)
* concrete and asphalt

* los decals
2023-08-29 17:50:11 -05:00
Morb0
6a241fbffd Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 19:36:13 +03:00
metalgearsloth
789c5e0a2b
Add fultons (#18958) 2023-08-29 16:34:05 +10:00
Ubaser
7065f6cc02
New bloodpack sprites (#18192)
* Add bloodpack sprite for testing ingame

* shrink

* small tweaks

* Update bloodpack.png

* add sprites

* add meta

* fix meta again

* fix regenerative-mesh

idk how i accidentally deleted it

* HOPEFULLY FINAL FIX AAA

* change copyright

* TEST

* Revert "TEST"

This reverts commit 34de38e2a228d3f28feed966404640cc8b6c788d.

* maybe fixed

* blue
2023-08-28 22:30:10 -06:00