Commit graph

7 commits

Author SHA1 Message Date
Morbo
e5fda096d9 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Nuke/NukeSystem.cs
#	Resources/Prototypes/Maps/box.yml
2023-02-25 07:37:50 +03:00
deltanedas
98b02b3d97
make emagged marker component (fixed version of #13867) (#14096)
* The all-in-one hacking solution
The thinking man's lockpick
The iconic EMAG

* emagged medbay's stasis bed

* left med, emagged sec' apc

* went back to chem, emagged the dispenser

* emagged the fax while i was there

* had a donut while waiting for emag to charge

* i broke into the bridge then announced 'mandatory johnson inspection in medical'

* get system instead of dependency

* feedback

* net suggestion

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* use EnsureComp and import NetworkedComponent

---------

Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-02-18 19:03:06 -06:00
Morbo
35ea494981 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Doors/Components/AirlockComponent.cs
#	Content.Server/Fax/FaxMachineComponent.cs
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-01-17 22:57:53 +03:00
eoineoineoin
bda5f8248f
Improve Paper UI, allow an to entity configure how it's UI looks (#13494)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-17 19:32:46 +11:00
Morb
1e7f7cc1e1
Update station goals system (#714) 2023-01-08 03:23:21 -08:00
Morb
6835ab0a04
Fax stamps (#13010)
* Change captain fax suffix

* Add stamps transmit

* Remove proto dependency

* Add centcom fax address for nuke codes

* Remove centcom address resolve

* Remove centcom id
2022-12-19 21:44:15 -06:00
Morb
dbba104eab
Fax Machine (#11704) 2022-12-12 05:06:11 +11:00