space-syndicate/space-station-14
1
0
Fork 1
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-09-07 20:56:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,992 Commits 14 Branches 0 Tags
icarus
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur e3784bc237 Complete spawn beam command 2022-07-11 16:41:35 +03:00
Arthur acc2fd5a55 Start creating spawn beam command 2022-07-11 02:15:30 +03:00
Arthur 179116cc22 Update UI button & add timer and cooldown 2022-07-10 01:41:20 +03:00
Arthur d07d294b91 Remove fire verb from terminal 2022-07-09 22:32:46 +03:00
Arthur f6e950cbf7 Update locale keys 2022-07-09 22:32:09 +03:00
Arthur 4410380abc Fix locale 2022-07-09 22:30:05 +03:00
Arthur ddd080f5f8 Add simple terminal UI for firing 2022-07-09 22:29:10 +03:00
Arthur 925ec94daf Dont call Ignite with visual update at every tick 2022-07-09 18:03:32 +03:00
Arthur 9e868145ff Correct beam spawning directed in center of station 2022-07-09 17:55:31 +03:00
Arthur 1e9966e946 Start work on beam spawn & launch direction 2022-07-08 20:57:19 +03:00
Arthur a3dab14c6c Rename stuff & add move separate launch method 2022-07-08 20:57:09 +03:00
Arthur 586cf26f0f Add arson radius for beam 2022-07-08 05:16:36 +03:00
Arthur 9b76fc7d74 Use AllMask for fixture beam 2022-07-08 03:02:12 +03:00
Arthur 24b3223403 Use ambient component for loop sound 2022-07-08 02:55:35 +03:00
Arthur a477e2f64f Combine sun ray sprites in one 2022-07-08 02:54:57 +03:00
Arthur dc2f707f12 Add states & preparing phase 2022-07-06 04:09:42 +03:00
Arthur 888f5714dc Tweak beam component 2022-07-06 00:35:05 +03:00
Arthur 4793eaa494 Copy singularity destroy logic to beam 2022-07-06 00:34:51 +03:00
Arthur 9f0a8ca631 Fix terminal parent 2022-07-04 17:37:49 +03:00
Arthur bdc027444f No rotation for beam 2022-07-04 17:37:34 +03:00
Arthur 54834dbb07 Remove IcarusBeam comments 2022-07-04 17:18:21 +03:00
Arthur 8941193a0f Terminal spawn IcarusBeam 2022-07-04 17:16:03 +03:00
Arthur 993b4315bb Revert "Concatenate images to one" 
This reverts commit acfe951a0c.
 2022-07-04 17:12:58 +03:00
Arthur c3d4e811db Add loop sound & destroying all 2022-07-04 17:12:49 +03:00
Arthur acfe951a0c Concatenate images to one 2022-07-03 16:47:21 +03:00
Arthur c0794feada Basic Icarus beam 2022-07-03 16:40:03 +03:00
Arthur f6598c255b Merge branch 'master' into icarus 2022-06-29 16:50:41 +03:00
MorberandGitHub 5e90aed713 Merge pull request #282 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-29 03:56:26 +03:00
Arthur fb5754b0e1 Fix round-end-system.ftl 2022-06-29 03:27:42 +03:00
Arthur 8235b39f4b Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-29 01:56:31 +03:00
Arthur 745f8164ad Update locale 2022-06-28 23:40:09 +03:00
Arthur e1e7dc2a9d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
 2022-06-28 22:33:18 +03:00
MorberandGitHub 7a14c6f331 Localize jobs (#8968) 
* Localize job supervisors

* Rename supervisors file

* Localize job names

* Remove localization for fallback job name

* Use LocalizedName for Job

* Fix job names case
 2022-06-28 22:55:05 +10:00
MorberandGitHub c0216e5caf Add missing channels for mining & robotics headsets (#9188) 2022-06-27 14:14:48 +10:00
Arthur f570a9de6c Basic fire system 2022-06-26 16:52:33 +03:00
Arthur 4591833d81 Add announcements & activation verb 2022-06-26 07:16:52 +03:00
Arthur a99c5c3488 Move system to server and add basic fire logic 2022-06-26 06:39:24 +03:00
Arthur 6df2a1a571 Use ItemSlots component for simplicity 2022-06-26 04:39:42 +03:00
Arthur ab44d02630 Add basic key insert to slot 2022-06-26 03:35:02 +03:00
MorberandGitHub 645d9d883e [Resprite] Direct windows/doors (#281) 
* Update direct windows sprites

* Update windoor sprites
 2022-06-26 00:49:27 +03:00
Arthur dafe921ac4 Add sounds 2022-06-25 17:11:41 +03:00
Arthur 445a0d544f Merge branch 'master' into icarus 2022-06-24 06:33:45 +03:00
MorberandGitHub 06cdae5bfc Merge pull request #278 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-24 06:00:57 +03:00
Arthur b7e2e931c9 Fix ConstructionStation cargo telepad 2022-06-24 05:48:46 +03:00
Arthur cdce1ef456 Fix ConstructionStation cargo computer 2022-06-24 05:33:57 +03:00
Arthur 790e066721 Reset translation for new cargo computers 2022-06-24 05:31:24 +03:00
Arthur 0825e27d92 Update locale 2022-06-24 05:06:39 +03:00
Arthur a5fa8904ec Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
 2022-06-24 04:58:34 +03:00
MorberandGitHub 068569035d Обновление оставшихся спрайтов полов (#277) 2022-06-24 04:49:15 +03:00
MorberandGitHub b68b14d6d1 Убрать доступ к техам у пассажиров (#269) 2022-06-24 04:35:29 +03:00
Arthur 9864bae192 Add basic server icarus components 2022-06-24 04:33:24 +03:00
Arthur 184bd103b0 Add to machine meta 2022-06-24 03:39:24 +03:00
Arthur a88eb38484 Update terminal sprites 2022-06-24 03:39:13 +03:00
Arthur d88fe1c1c4 Add computer goldeneye sprites to machines 2022-06-24 03:28:55 +03:00
Arthur 81fb2c02a2 Add sprites 2022-06-23 16:04:49 +03:00
Arthur 49afa5c89e Add workflow to remove statuses after approve 2022-06-23 15:33:16 +03:00
MorberandGitHub 92df17d6ee Команда adminwho не требует прав (#276) 
This reverts commit c6f5734bdc.
 2022-06-23 15:08:32 +03:00
MorberandGitHub 970c2eabb5 Give nuke ops their access (#9028) 2022-06-22 14:27:23 -05:00
MorberandGitHub d958ababb9 Add SignalSwitch sound (#9013) 2022-06-21 17:51:42 -07:00
MorberandGitHub 8831ce3b97 Fix labeler localization path 2022-06-21 01:24:26 +03:00
MorberandGitHub 0d889e1984 [Resprite] Tile Decals (#270) 2022-06-20 18:00:11 +03:00
MorberandGitHub 7ec5458ebf [Resprite] Airlocks (#263) 
* Update layers rendering logic

* Add open layer for bolts & emergency access

* Update glass airlock sprites

* Update panel & sparks sprites

* Update medical airlock sprite

* Hide panel open sprite

* Update science airlock sprite

* Add glass to science airlock sprite

* Update security airlock sprites

* Fix glass airlock overlay sprites

* Update basic glass airlock sprites

* Update glass atmospherics airlock sprites

* Update glass cargo airlock sprites

* Update glass command airlock sprites

* Update glass engineering airlock sprites

* Tweak airlocks meta.json

* Fix glass meta.json

* Update atmospherics airlock sprites

* Update base airlock sprites

* Update cargo airlock sprites

* Update command airlock sprites

* Update engineering airlock sprites

* Update freezer airlock sprites

* Update maint airlock sprites

* Fix maint airlock sprites

* Update medical airlock sprites

* Update science airlock sprites

* Update security airlock sprites

* Update external airlock sprites

* Add missing states for shuttle airlocks

* Update glass external airlock sprites

* Update highsec airlock sprites

* Update meta.json copyright

* Update meta.json copyright
 2022-06-20 17:25:13 +03:00
Arthur 038923bfe5 Add localization change label 2022-06-20 07:58:04 +03:00
MorberandGitHub 581b2ae160 Merge pull request #266 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-18 08:04:11 +03:00
MorberandGitHub 9f4170f790 Revert "Upstream sync (#264)" (#265) 
This reverts commit bbf7deadeb.
 2022-06-18 08:03:07 +03:00
+17
MorberGitHubKaraand_ametalgearslothwrexbeike709EmisseEmoGarbage404PJBotmetalgearslothkeronshbKIBORG04Leon FriedrichthemiasFlipp SyderDelete69RaneCrudeWaxPeptide90eclips_eJust-a-Unity-DevProfane McBaneJust-a-Unity-DevScalyChimpTaralGitT-Stalker
 		bbf7deadeb Upstream sync (#264) 
* Remove merge conflict comment (#8819)

* Revert "Remove merge conflict comment" (#8820)

* Captain laser self recharge (#8826)

* Update coffee.yml (#8830)

* Automatic changelog update

* Nerf pistol firerate slightly (#8810)

* Don't flag merge conflicts on draft PRs (#8821)

* Automatic changelog update

* Guns will now eject magazines first instead of chamber (#8827)

* Removal interaction without hands (#8843)

* Automatic changelog update

* Disable lag rand (#8847)

* Make doorbumps quiet (#8812)

* Syndicate gas mask flash protection (#8818)

* Syndicate gas masks protect from flashbangs

* fix var name

* update to loop through all slots

* update based on review comments

* Fix grenade whitelists (#8851)

* Automatic changelog update

* fixes static not appearing inbetween camera changes client-side (#8846)

* 39 buried 0 found (#8856)

* The Rat King [Antag] (#8706)

* vending machine go spit

* who's da rat, bozo

* fixes

* crown + fixes

* aaaa

* aa

* lololol

* removing vending shit + most annoying fix alive

* paul review

* moony fixes

* sloth review

* Minor diseasesystem fix

* inverse moment

* A

* Also reduce args allocations

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Increase fireplace brightness and radius (#8870)

* Automatic changelog update

* Can't break other people's drags on cuffed people (#8868)

* works on my machine

* speedrun

* Automatic changelog update

* Fishy swarmers: Carp content and Space Dragon! (#7395)

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Add docking window to shuttle consoles (#8756)

* lewd

* A

* Realtime

* Sleepy dork

* Draw radar position

* Accurate infiltrator

* experiments

* Better drawing

* Labels

* I need aan adult

* Cleanup

* Show toggles

* display I guess

* A

* fix

* fix

* cleanupsies

* Bit more polish

* Make sure mass scanners actually work

* Remove dummy state

* fren

* opposite

* aghost crash

* comment

* What's in a name

* woops

* Show docking ports

* Dock highlighting

* Drawing dock

* Shitty docks

* Lots of docking drawing

* Autodock working

* dork

* More graceful shutdown

* zoomies

* Lines and distance change

* revert

* Good enough

* cleanup

* Fix default range

* Dock UI and loc update

* Update on undock

* Loc fixes

* Automatic changelog update

* Update submodule

* Reduce door hacking time (#8852)

* Fix damagestatevisualizer (#8876)

* Nerf gun damage (#8853)

* Automatic changelog update

* One more damagestatevisualizer funny (#8877)

* Fix damagestatevisualizer (#8879)

* Make holofans use power cells (#8813)

* Automatic changelog update

* Nerf dragon audio + do_after (#8880)

* Power cell culling (#8814)

* Automatic changelog update

* Fix powercell (#8882)

* Individual bar sign entities (#8159)

* Fixed rotation check for pulling (#8845)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Reduced laser pistols to 10 size (#8840)

* Automatic changelog update

* Fix carbine size

* make animals gibbable (#8875)

* Automatic changelog update

* Fix addatmos from griduid artifact

* Station Specific Jobs: Reporter and Psychologist (#8865)

* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json

* Basic Medication Overdoses (Chemistry 1984) (#8844)

* 1984 george orwell

* Update medicine.yml

* Update medicine.yml

* Update medicine.yml

* Automatic changelog update

* Fix admin announce eui (#8869)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Removes extra Sound from slippery component (#8841)

* Add a Wiki Button to the escape menu (#8837)

* UI change

* lang file change

* C# change

* fix wiki button

Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>

* Automatic changelog update

* Move cuffs to users hand when removed (#8862)

* move cuffs to users hand when removed

* review

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Make ghost timer a cvar (#8817)

Co-authored-by: Just-a-Unity-Dev <rnmangunay@addu.edu.ph>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* reduced duck yaml bloat (#8858)

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

* Fix mousetrap crate icon (#8835)

* Fix bagel yml artifact (#8885)

* Fix wide attacking in containers (#8886)

* Automatic changelog update

* Clean up door remote (#8829)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* ECS containmentfieldgeneratorcomponent (#8757)

* ECS containmentfieldgeneratorcomponent

* Fix tests and clean up one line

* check for anchored in a better way

* Fix dependency exception

I'm not really happy with this solution, it's not very good but I'm not
sure how to do it better without refactoring way more than I want to. Maybe
I'm missing something.

* review

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* water (#8903)

* Cleanup the remainder of dragon (#8881)

* Cleanup the remainder of dragon

- Fixed some of the niscellaneous changes made to yml
- Made devour use a whitelist
- Fixed spelling

* name fix

* a

* Update submodule

* Remove reporter tophat (#8912)

* Disarm 1984 (#8872)

* Automatic changelog update

* Make wide attacks optional for now (#8924)

* Port miasma from nyano (#8926)

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Automatic changelog update

* Fix dragon devour and reduce time significantly (#8921)

* deleted check (#8893)

* Botany + engi belt whitelist update (#8939)

* Automatic changelog update

* Mobster accents for rat king/servants (#8927)

* basically perfect

* oops

* huh

* new substitutions from retequizzle, rane, and olddancejacket + crown accent

* fixes

* Automatic changelog update

* quickfix (#8942)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>

* More kinds of benos (#8849)

* weh

Multiplies the amount of power used by the battery guns, triple-ish for the laser cannon and a fuckton more for the xray

* weh

* weeee

* Fix the offsets and bb

* remove arc

* rouny

* sound stuff and fix the typo

* Fix dork

* a

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Adds other botany tools (#8935)

* Automatic changelog update

* Add screwdriver head sprite (#8828)

* Silent Station Events (#8938)

* Automatic changelog update

* Update locale

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
Co-authored-by: ike709 <ike709@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: KIBORG04 <bossmira4@gmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Delete69 <95458399+Delete69@users.noreply.github.com>
Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com>
Co-authored-by: CrudeWax <75271456+CrudeWax@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Co-authored-by: eclips_e <67359748+Just-a-Unity-Dev@users.noreply.github.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: Profane McBane <profanedbane+github@gmail.com>
Co-authored-by: Just-a-Unity-Dev <rnmangunay@addu.edu.ph>
Co-authored-by: ScalyChimp <72841710+ScalyChimp@users.noreply.github.com>
Co-authored-by: TaralGit <76408146+TaralGit@users.noreply.github.com>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
 2022-06-18 08:00:27 +03:00
Arthur a8ab23898d Update locale 2022-06-18 07:16:03 +03:00
Arthur 5b9ec5ce3e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Interaction/SharedInteractionSystem.cs
 2022-06-18 07:08:37 +03:00
MorberandGitHub cbfcdde8bd Add screwdriver head sprite (#8828) 2022-06-18 13:42:15 +10:00
MorberandGitHub 7b7c313a92 Fix mousetrap crate icon (#8835) 2022-06-16 20:21:45 +10:00
MorberandGitHub 5f8a3f90c9 Перевод спрайтов настенных табличек (#260) 2022-06-16 03:01:57 +03:00
MorberandGitHub 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
Arthur 2e47ff6266 Typo issue template 2022-06-16 01:57:03 +03:00
Arthur 42f236c8bc Add ids to blocks to issue template 2022-06-16 01:37:58 +03:00
Arthur 60743aca45 Rename issue template to bug_report 2022-06-16 01:27:06 +03:00
Arthur 39f0349d1e Return issue template 2022-06-16 01:26:11 +03:00
Arthur 1ab60cb3f2 Delete issue template 2022-06-16 01:25:54 +03:00
Arthur 8c737d761e Update Github issue template 2022-06-16 00:04:53 +03:00
Arthur 74c3545c8d Fix guns locale desc 2022-06-15 21:22:21 +03:00
Arthur 646d327e4a Fix plasma stack icon 2022-06-14 11:14:47 +03:00
Arthur 794b193e23 Use custom rules file 2022-06-14 05:04:16 +03:00
Arthur ec6b926d5a Mistake in Machete locale 2022-06-14 02:08:14 +03:00
MorberandGitHub d9f44b2dc2 [Resprite] Material sheets (#248) 2022-06-13 21:27:55 +03:00
MorberandGitHub cd65cd152b [Resprite] Walls (#247) 
* Add TauCeti to icon smooth tool

* Update solid walls texture

* Update window texture

* Update reinforced plasma window texture

* Mistake window texture with reinforced window

* Update window texture

* Update reinforced window copyrights

* Update plasma window texture

* Update reinforced tined window texture

* Make windows smooth with walls
 2022-06-13 21:27:24 +03:00
MorberandGitHub 67071ed5dc Merge pull request #246 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-13 21:26:15 +03:00
Arthur fe6069dd34 Remove saltern power prototype locales 2022-06-13 20:52:52 +03:00
Arthur 0fc74cdac7 Fix ConstructionStation map 2022-06-13 20:51:01 +03:00
Arthur 88bd44c2bc Update locale 2022-06-13 17:56:27 +03:00
Arthur 46de728dce Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Maps/infiltrator.yml
 2022-06-13 16:50:11 +03:00
MorberandGitHub 9849b16e40 Use correct PRGlass parent (#8805) 2022-06-13 17:50:11 +10:00
Arthur 548429b84c Fix translation of DrinkHellRamen description 2022-06-12 13:49:40 +03:00
Arthur 4ff05b68d3 Fix mind-component.ftl translation 2022-06-11 20:57:20 +03:00
Arthur beacf439f3 Update locale 2022-06-11 02:54:26 +03:00
Arthur d0c5c06e4d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
 2022-06-11 02:46:43 +03:00
Arthur 8b194ca619 Update CHANGES.md 2022-06-09 21:08:23 +03:00
Arthur 8893da73eb Fix fluent syntax for preset-pirates.ftl 2022-06-09 01:41:02 +03:00
MorboandGitHub e2d5f0c68e Merge pull request #238 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-06 05:20:36 +03:00
Arthur b1dddb1d9a Fix ConstructionStation BoxSterile item type 2022-06-06 05:05:57 +03:00
Arthur 00e95ec808 Add new locale 2022-06-06 04:45:59 +03:00
Arthur 1777079022 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-06 04:43:14 +03:00