Commit Graph

544 Commits

Author SHA1 Message Date
Swept
8da0901b8e Adds inhands for radio/walkietalkie (#4483)
* Adds inhands for radio/walkietalkie and separates layers

* License thingy

* Fixes test
2021-08-17 19:42:43 -07:00
Swept
f1a2c3df8a Adds plant clippers and changes hydro tool sprites to be more consistent (#4482)
* Adds plant clippers

* Updates sycthe, hoe and spade sprites
2021-08-17 19:42:34 -07:00
Swept
ff44b83fd6 Fixes cigarette animations and matches now have lit/unlit inhand sprites (#4480) 2021-08-17 23:26:35 +00:00
Swept
6abe0de900 Adds inhands for crayons and the crayon box (#4481) 2021-08-17 22:28:58 +00:00
Swept
0a1b79d027 Centers some sprites 2021-08-16 19:41:08 -07:00
Swept
bada427eb2 Deletes old crowbar_red.rsi 2021-08-11 14:07:07 -07:00
Swept
be718fd309 Parents crowbar-red and merges RSIs 2021-08-11 09:37:31 -07:00
Swept
b16a044a2b Added restrictions for what can be inserted into most belts (#4367)
* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo
2021-08-10 13:36:00 -07:00
Kara D
991d4390f2 swept moment 2021-08-05 22:06:55 -07:00
Kara D
9354abb024 reviews + test 2021-08-05 22:01:02 -07:00
Kara D
5af4c06231 construction 2021-08-05 21:10:06 -07:00
Kara D
e460285187 proper sprites + visualizes nicely 2021-08-05 19:43:58 -07:00
Kara D
a651743235 fix rsi 2021-08-05 17:45:49 -07:00
Kara D
7bab388f55 Revert "Updated meta.json to standard"
This reverts commit 8ea7a3ad1f.
2021-08-05 17:39:55 -07:00
Kara D
adeb1189e3 Revert "Update meta.json to standard"
This reverts commit 4c6702f17b.
2021-08-05 17:39:51 -07:00
Kara D
7a87027213 Merge branch '2021-07-16/windoors' of github.com:mirrorcult/space-station-14 into 2021-07-16/windoors 2021-08-05 17:37:27 -07:00
Kara D
8dbd17045b Merge branch 'master' into 2021-07-16/windoors
# Conflicts:
#	Content.Server/Doors/Components/AirlockComponent.cs
2021-08-05 17:36:13 -07:00
Swept
4c6702f17b Update meta.json to standard 2021-08-06 00:17:51 +00:00
Swept
8ea7a3ad1f Updated meta.json to standard 2021-08-06 00:16:42 +00:00
Swept
532c9a6431 Adds an alternate jumpsuit for botany (#4419)
* Adds an alternate botanists jumpsuit

* Updated license information
2021-08-05 20:18:05 +10:00
Vera Aguilera Puerto
331604cc66 GasFilter appearance, EnabledAtmosDeviceVisualizer improvements. 2021-08-02 13:20:31 +02:00
Kara Dinyes
c8f79fdcaf windoors work #Dab 2021-07-25 20:21:02 -07:00
Kara Dinyes
ecad9fc32d Merge branch 'master' into 2021-07-16/windoors 2021-07-25 18:25:59 -07:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342)
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
metalgearsloth
500b9cb1ea Make Saltern driveable (#4257)
* Broadphase refactor (content)

* Shuttle jank

* Fixes

* Testing jank

* Features and things

* Balance stuffsies

* AHHHHHHHHHHHHHHHH

* Mass and stuff working

* Fix drops

* Another balance pass

* Balance AGEN

* Add in stuff for rotating shuttles for debugging

* Nothing to see here

* Testbed stuffsies

* Fix some tests

* Fixen test

* Try fixing map

* Shuttle movement balance pass

* lasaggne

* Basic Helmsman console working

* Slight docking cleanup

* Helmsman requires power

* Basic shuttle test

* Stuff

* Fix computations

* Add shuttle console to saltern

* Rename helmsman to shuttleconsole

* Final stretch

* More tweaks

* Fix piloting prediction for now.
2021-07-21 21:15:12 +10:00
Kara Dinyes
1f7809772b finished yaml 2021-07-17 21:39:08 -07:00
Kara Dinyes
74b61438c4 first windoor commit 2021-07-17 21:21:36 -07:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Pieter-Jan Briers
103bc19508 Pow3r: stage 1 (#4208)
Co-authored-by: 20kdc <asdd2808@gmail.com>
2021-07-04 18:11:52 +02:00
DmitriyRubetskoy
d10885742b Omnizine and donk-pockets (#4250)
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-07-03 01:16:21 +00:00
Swept
d6805f47a3 Added fireaxe cabinets (#4221)
* Added fireaxe cabinets

* Now inserts and renamed ItemCabinetVisuals file

* Added netsync

* Cut out layers for future ItemCabinetVisualizer work and reorganized some RSIs

* Update Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json

* Update Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-06-25 13:27:22 +10:00
SweptWasTaken
e16c23a747 AME jars and parts now have inhand sprites 2021-06-23 00:39:35 -07:00
Swept
a51305466e Makes more stuff destructible/breakable (#4081) 2021-06-19 19:34:01 +00:00
T-Stalker
a1cc4350ca Vox plushie (#4146)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-19 18:12:55 +00:00
Vera Aguilera Puerto
a2b737d945 Atmos pipe rework (#3833)
* Initial

* Cleanup a bunch of things

* some changes dunno

* RequireAnchored

* a

* stuff

* more work

* Lots of progress

* delete pipe visualizer

* a

* b

* pipenet and pipenode cleanup

* Fixes

* Adds GasValve

* Adds GasMiner

* Fix stuff, maybe?

* More fixes

* Ignored components on the client

* Adds thermomachine behavior, change a bunch of stuff

* Remove Anchored

* some work, but it's shitcode

* significantly more ECS

* ECS AtmosDevices

* Cleanup

* fix appearance

* when the pipe direction is sus

* Gas tanks and canisters

* pipe anchoring and stuff

* coding is my passion

* Unsafe pipes take longer to unanchor

* turns out we're no longer using eris canisters

* Gas canister inserted tank appearance, improvements

* Work on a bunch of appearances

* Scrubber appearance

* Reorganize AtmosphereSystem.Piping into a bunch of different systems

* Appearance for vent/scrubber/pump turns off when leaving atmosphere

* ThermoMachine appearance

* Cleanup gas tanks

* Remove passive gate unused imports

* remove old canister UI functionality

* PipeNode environment air, make everything use AssumeAir instead of merging manually

* a

* Reorganize atmos to follow new structure

* ?????

* Canister UI, restructure client

* Restructure shared

* Fix build tho

* listen, at least the canister UI works entirely...

* fix build : )

* Atmos device prototypes have names and descriptions

* gas canister ui slider doesn't jitter

* trinary prototypes

* sprite for miners

* ignore components

* fix YAML

* Fix port system doing useless thing

* Fix build

* fix thinking moment

* fix build again because

* canister direction

* pipenode is a word

* GasTank Air will throw on invalid states

* fix build....

* Unhardcode volume pump thresholds

* Volume pump and filter take time into account

* Rename Join/Leave atmosphere events to AtmosDeviceEnabled/Disabled Event

* Gas tank node volume is set by initial mixtuer

* I love node container
2021-06-19 13:25:05 +02:00
DrSmugleaf
e9d8c56ad1 Fix license and copyright being swapped in firstaidkits.rsi (#4191) 2021-06-16 15:52:48 +02:00
TaralGit
1188d3bafb Added claymore as a weapon (#4124)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-06-09 05:21:08 +00:00
20kdc
6a78c401bf Singularity Fixes, Part 3 (#4105)
* Hopefully make singularity shader warping resolution-invariant

This may or may not fix intensity issues

* Fix singularity 'zero velocity' check

It got stuck in a corner. Twice. I really thought I'd fixed that.

* Make it easier to move around various power stuff by shrinking their AABBs a little and making singulo generator a circle

* Changes to some machine prototypes to reduce duplication of collision changes (#1)

* Changes to some machine prototypes to reduce duplication of collision changes

* BaseMachine.BaseMachineUnpowered -> BaseMachine.BaseMachinePowered
2021-06-03 00:55:50 -07:00
Swept
74d044a4a9 Adds more splat and tweaks PuddleComponent.cs (#3942)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-05-21 00:19:18 +00:00
SweptWasTaken
00c844a410 Fixes holes in Captain's jumpsuit and adds Captain's jumpskirt 2021-05-20 09:21:48 -07:00
SweptWasTaken
00b0760db3 Updates a lot of clothing inhands 2021-05-09 18:34:38 -07:00
SweptWasTaken
a749d95f97 Fix glass sheet inhands 2021-05-08 16:16:06 -07:00
Swept
55a04bfc30 Cleaned up all produce meta.jsons (#3943) 2021-05-08 09:09:35 +00:00
SweptWasTaken
d45b0a4907 Removes a vestigal plate 2021-05-07 23:28:12 -07:00
SweptWasTaken
16daf3ed17 Adds inhands for matches 2021-05-05 13:52:30 -07:00
Swept
6376e60b78 Massive Food PR (#3436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
SweptWasTaken
84d83d1902 Slight fixes for sabre and machete inhands 2021-04-28 16:31:47 -07:00
TaralGit
ebec1b7dcf Inhands for pistols, beakers, reworked melee weapons and laser gun (#3887)
* new pull

* beakers

* melee

* ffs

* hope this works

* ffffff

* Update meta.json

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-28 21:14:27 +00:00
SweptWasTaken
0976755eb0 Minor RSI fixes and corgi hide name 2021-04-22 12:11:48 -07:00