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
Morb0
22283a01f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Shared/Chat/SharedChatSystem.cs
2023-08-15 00:08:39 +03:00
c4llv07e
d7eb3bfb44
Pipe painter (now with airlock painter) ( #19031 )
...
* Add a pipe painting function to the airlock painter
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Rename engineer painter to omnipainter
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review changes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* fix migration duplicate
Signed-off-by: c4llv07e <kseandi@gmail.com>
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
2023-08-14 15:06:21 +03:00
Morb0
9a4db6ca8d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Doors/Systems/AirlockSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/diona.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Tiles/attributions.yml
2023-08-11 03:09:35 +03:00
chromiumboy
2df70799f8
Add access configurator ( #18638 )
...
The access configurator programs the access levels of any access reader. To use the access configurator, players must:
- Insert an ID card
- Click a nearby entity with an access reader with the access configurator in hand
- Change the access list
Note that players only need one of the access levels listed on the device to lock/unlock it, but will only be able to alter access settings when they all of the access levels listed on the device
For example, an airlock which has 'Science' and 'Engineering' access listed can be opened by any player with either 'Science' or 'Engineering' access. However, to change the access settings on this airlock, a player must have both 'Science' and 'Engineering' access. This is to prevent people from easily breaking into secure areas with this tool, by adding one of their own access levels to the target device
Obviously, the most useful ID card to use with this tool is one with all access, since it can change the settings of any device. Removing all access requirements from a device will make it useable by anyone.
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-08 10:30:46 -08:00
KingFroozy
cdfdccd92f
Minor changes to Jaws of life and power drill sprites ( #18379 )
...
* Minor sprite changes to power drill
* Minor in-hand spirte changes to Jaws of life
* Update meta.json
* Update meta.json
2023-07-27 14:03:27 -06:00
faint
69ddbdd9f4
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Prototypes/secret_weights.yml
2023-05-31 03:26:01 +03:00
Nemanja
1aceaccc27
Resprite network configurator ( #16838 )
2023-05-27 13:51:33 +10:00
Morb0
c124b716a3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Traits/TraitSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Research/technologies.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/moose.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Julian Giebel
84aaec20d9
Revert "resprite network configurator ( #16214 )" ( #16598 )
...
This reverts commit 9011039b52
2023-05-19 03:27:08 -06:00
Morb0
5e8d55caf8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
2023-05-13 10:39:34 +03:00
deltanedas
9011039b52
resprite network configurator ( #16214 )
2023-05-12 17:09:37 -04:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
Julian Giebel
6ebd784cb6
Device Linking and better linking ui ( #13645 )
...
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-07 16:07:24 +10:00
Morbo
82a466f4ff
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
Alekshhh
1b5e80620d
Held Toolbox Resprite ( #14482 )
2023-03-07 09:48:33 -04:00
Nairod
63889267ef
Belt Appraisal Tools ( #14413 )
2023-03-06 00:23:02 -04:00
Morbo
6343d1e1f8
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
metalgearsloth
8d66511515
Delete hydroponics bags ( #13106 )
2022-12-20 09:38:07 +01:00
Pieter-Jan Briers
14f8b4e6d5
Use new validate-rsis for workflow ( #12997 )
...
* Use new validate-rsis for workflow
* A
* Add python deps
* --ignore-installed
* Make it only work on RSI changes again.
* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Morbo
f032966976
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
2022-12-07 08:34:29 +03:00
Alex Evgrashin
04db7d0fdd
Geiger counter ( #12082 )
2022-12-06 17:56:52 -08:00
Morbo
8e8db65621
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Maps/Shuttles/emergency.yml
2022-11-26 10:49:59 +03:00
Gaxeer
f625822365
fix: add missing flame to cowelder ( #12680 )
2022-11-25 22:27:45 +11:00
Morbo
bfa402a3e6
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-11-05 06:14:39 +03:00
Vordenburg
b4fbc63132
Add necessary sprites for welder_mini. ( #12368 )
2022-11-03 16:22:56 -05:00
Morbo
06399f4e51
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Tools/welder.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
2022-11-02 04:55:26 +03:00
Vordenburg
784e0ab51f
Make welder flames like proper unshaded lights. ( #12320 )
...
* Make welders use ToggleableLightVisualsComponent.
* Remove old code from ToolSystem.Welder.
* Update welder sprites.
2022-11-01 20:16:33 -05:00
Morb
dbe683e06b
[Resprite] Airlock painter ( #478 )
2022-10-23 09:39:34 -07:00
Arthur
6edf90d517
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_1.png
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_2.png
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_3.png
# Resources/Textures/Tiles/attributions.yml
2022-08-07 13:28:53 +03:00
Kara
b947151d9a
Bucket solution fills + ECS SolutionContainerVisualizer ( #10289 )
2022-08-07 01:50:52 -07:00
Arthur
421895e321
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-07-08 20:58:22 +03:00
ninruB
3c4998649b
Make the extra bright lantern actually flash you. ( #9387 )
...
* lantern goes STUN STUN
* fix an awkward extra spacebar
* fixing the lantern as emogarbage suggested
* buffs the usage amount
ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.
* fixed encoding
2022-07-05 11:40:19 -07:00
Morber
cbfcdde8bd
Add screwdriver head sprite ( #8828 )
2022-06-18 13:42:15 +10:00
Morber
734bc1d471
[Resprite] Tools ( #253 )
...
* Update crowbar icons
* Update drill icons
* Update jaws of life icons
* Update wrench icon
* Update welder mini icons
* Update welder icon
* Update industrial welder icon
* Update experimental welder icon
* Update industrial advanced welder icon
* Fix experimental welder
* Update wire cutters icon
* Update t-ray scanner icon
* Update multitool icon
* Update screwdriver icons
* Update RCD icons
2022-06-16 03:01:26 +03:00
Moony
fada213a22
Implements item pricing, and piracy. ( #8548 )
...
* Start implementing item pricing.
* Flesh out prices a bit, add the appraisal tool.
* Add prices to more things.
* YARRRRRRR
* gives pirates an appraisal tool in their pocket.
* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.
* Address reviews.
* Address reviews.
2022-06-03 10:56:11 -05:00
Peptide90
d433234fe3
Industrial and Advanced Welders ( #7855 )
2022-05-02 15:51:24 -07:00
Chris V
94a0bc92b7
Salvage mining, ore processing, and material clean-up ( #7406 )
...
* adding stuff cuz new computer
* removed unused materials
* remove unused materials and such, lathe things
* material volume no longer hardcoded
* fixed mining system
* add 5 stacks of materials, and add them to the ore processor
* fix copyright for ores and handdrill
* comma momma
* whyyyyy
* more fixes to make the yaml linter happy
* i should get my eyes checked
* silver proper
* more cleanup
* leftovers
* remove more references to material doors
* couldn't bear to be without bearhide
* added uranium, added more lathe recipes
* copyright fix, stack fix
* ore processor sprite and such
* ore processing some binches
* MaterialCotton removal
* 1 uranium ore means 1 sheet
* fix merge conflict? idk
* time to ketchup
* lathe recognizes material volume again
* yaml cleanup
* forgot to remove adamantine lol
* re-added diamond for now
* diamond stacks
* functional ore processor
* added ignoreColor to lathe visuals
* ore processor machine board
* add board to industrial tech and circuit printer
* provided lathes their whitelists
* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance
* re-added ore processor
* typos and cleanup
* Update Content.Client/Lathe/LatheSystem.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update Content.Server/Lathe/LatheSystem.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* revert mapchange
* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn
* actually null canceltoken
* remove five-stacks, ore processor produces full stacks or single sheets/ingots
* VV proper
* adjust ore chances
* readd Cotton
* Update Content.Server/Mining/MineableSystem.cs
* tweaks
* Material is now dict (material, volume)
* removed unused property
* Space crystal -> space quartz
* forgor asteroid space quartz
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 20:41:04 +10:00
Joosep Jääger
0cdb34741e
Airlock visuals ( #7261 )
2022-04-16 15:31:12 +10:00
Leon Friedrich
4bc73ac591
Make flashlights, atmos hardsuit, and RGB use the new layer features ( #6253 )
...
* Make flashlights, atmos hardsuit, and RGB use the new layer features
* avoid self-conflict
* fix rgb not updating on add
* cleanup
* Update Content.Client/Light/RgbLightControllerSystem.cs
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
* cleanup diff
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-30 00:57:35 -05:00
CrudeWax
f1e6b26b37
ID and Emag retexture + Uplink message bugfix ( #7102 )
...
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-20 14:59:50 -07:00
Chris V
90498edbbb
Add the Omnitool, drone adjustments ( #6948 )
2022-03-15 18:11:29 -07:00
Rane
8049a709e6
Emags ( #6738 )
2022-02-17 19:43:24 -07:00
Mith-randalf
916d9e1e23
Lighters ( #5836 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-12-21 18:20:32 +01:00
Flipp Syder
c0bfe43a05
Adds T-ray Scanners ( #5420 )
2021-12-14 18:46:47 +11:00
Watermelon914
4bf8a5d527
Adds hand labelers ( #4903 )
...
* Adds hand labelers
* Removes unnecessary thing
* Docs
* Reverts some changes
* Addresses comments and adds inhand sprites
* Addressed comments
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
2021-10-16 13:34:05 -07:00
Swept
39571697a5
Added open/close/stacklayers for Matchbox and inhands ( #4496 )
...
* Added open/close/stacklayers for Matchbox
* Added inhands for matchbox
* What am I a clown not gonna leave no indent spaces
2021-08-20 05:37:01 +00:00
Swept
9d22869e58
Adds a ton more inhands ( #4488 )
...
* Removed useless loc and added inhands for some lamps
* Adds a ton of inhands to the game
* Actually adds the pill inhand
* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-20 05:36:32 +00:00
Swept
1341d63ae0
Adds duck-related content and a seclite ( #4489 )
...
* Added rubber ducky
* Adds ducky slippers
* Adds seclite
* Update Resources/Textures/Objects/Tools/seclite.rsi/meta.json
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
* Update Resources/Textures/Objects/Fun/ducky.rsi/meta.json
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
* The duck slippers now quack as you walk
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-19 16:23:49 -07:00
