Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create LICENSE.TXT #4

Merged
merged 1 commit into from
Aug 2, 2017
Merged

Create LICENSE.TXT #4

merged 1 commit into from
Aug 2, 2017

Conversation

Acruid
Copy link
Contributor

@Acruid Acruid commented Aug 2, 2017

Adds the MIT license to the project.

@ZoldorfTheWizard ZoldorfTheWizard merged commit 3bc75ef into master Aug 2, 2017
@PJB3005 PJB3005 deleted the add-license-1 branch August 2, 2017 22:50
juliangiebel referenced this pull request in juliangiebel/space-station-14 Aug 29, 2020
@SweptWasTaken
Merge pull request #4 from juliangiebel/stripping-saltern
9c8ef2c 
Map new power system and some materials
metalgearsloth referenced this pull request in metalgearsloth/space-station-14 Dec 7, 2021
@gradientvera
Merge pull request #4 from wrexbe/moremorechangesgo
75247b7
moonheart08 pushed a commit to moonheart08/space-station-14 that referenced this pull request May 26, 2022
@Veritius
Merge pull request space-wizards#4 from moonheart08/admeme-buttons
bd82f8b 
Admeme buttons
LudwigVonChesterfield added a commit to LudwigVonChesterfield/space-station-14 that referenced this pull request Jun 8, 2022
@LudwigVonChesterfield
Adding CONTRIBUTING.md (space-wizards#4)
8cc74e3 
adding CONTRIBUTING.md
MLGTASTICa pushed a commit to MLGTASTICa/space-station-14 that referenced this pull request Aug 5, 2022
@Humonitarian
Merge pull request space-wizards#4 from SweptWasTaken/eris-TDM-upstre…
ce23ac2 
…amget

Pulls latest upstream from space-wizards
Just-a-Unity-Dev added a commit to Just-a-Unity-Dev/space-station-14 that referenced this pull request Sep 6, 2022
@Just-a-Unity-Dev
Merge pull request space-wizards#4 from 2G2C/zed-tweaks
5ff853c 
Zombie tweaks
CaptainSqrBeard pushed a commit to CaptainSqrBeard/space-station-14 that referenced this pull request Dec 2, 2022
@Mr0maks
Merge pull request space-wizards#4 from Workbench-Team/moths
d954ef1 
bruh
moonheart08 added a commit to moonheart08/space-station-14 that referenced this pull request Dec 26, 2022
@moonheart08 @silicons-bot
@EmoGarbage404 @lunar-crater-ex @DrSmugleaf @Carbonhell @Chief-Engineer @metalgearsloth
Merge upstream 12/25/2022 (space-wizards#4)
f9f3bb5 
Co-authored-by: silicons-bot <121360372+silicons-bot@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: lunar-crater-ex <112364074+lunar-crater-ex@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Francesco <frafonia@gmail.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
eoineoineoin added a commit to eoineoineoin/space-station-14 that referenced this pull request Jan 6, 2023
@eoineoineoin
Remove obsoletion warnings from StackVisualizer
413c824 
 This is a combination of 4 commits.
 This is the 1st commit message:

Move StackVisualizer to Content.Shared.StackVisualizerComponent (temporarily), update content. Visualizer disabled for now.

 This is the commit message space-wizards#2:

Convert StackVisualizer from AppearanceVisualizer to VisualizerSystem

 This is the commit message space-wizards#3:

Split StackVisualizerComponent into seperate file, add some comments
    Intention had been to merge StackVisualizerComponent and
    StackComponent, but there are some prototypes which use
    StackVisualizerComponent without StackComponent (to great effect)

 This is the commit message space-wizards#4:

Don't netsync stack visualizer components
eoineoineoin added a commit to eoineoineoin/space-station-14 that referenced this pull request Jan 6, 2023
@eoineoineoin
Remove obsoletion warnings from StackVisualizer
b1b3382 
 This is a combination of 4 commits.
 This is the 1st commit message:

Move StackVisualizer to Content.Shared.StackVisualizerComponent (temporarily), update content. Visualizer disabled for now.

 This is the commit message space-wizards#2:

Convert StackVisualizer from AppearanceVisualizer to VisualizerSystem

 This is the commit message space-wizards#3:

Split StackVisualizerComponent into seperate file, add some comments
    Intention had been to merge StackVisualizerComponent and
    StackComponent, but there are some prototypes which use
    StackVisualizerComponent without StackComponent (to great effect)

 This is the commit message space-wizards#4:

Don't netsync stack visualizer components
Salex08 referenced this pull request in Salex08/space-station-14 Mar 22, 2023
@Salex08
Rev Gamemode (HippieStation#4)
92f1cc2 
Co-authored-by: Void-Crew2@gm <voidcrew22@gmail.com>
Salex08 referenced this pull request in Salex08/space-station-14 Mar 22, 2023
@Salex08
Revert "Rev Gamemode (HippieStation#4)" (HippieStation#5)
46dc3dc 
This reverts commit 92f1cc2.
deltanedas referenced this pull request in deltanedas/space-station-14 May 4, 2023
@Ilya246
Merge pull request #4 from deltanedas/killer
d2bf4e6 
troll
Just-a-Unity-Dev added a commit to Just-a-Unity-Dev/space-station-14 that referenced this pull request Jul 1, 2023
@Just-a-Unity-Dev
Merge pull request space-wizards#4 from Just-a-Unity-Dev/ftl14-genera…
3293cc5 
…tors

Generators and AmbientHeater system
Partmedia pushed a commit to Partmedia/space-station-14 that referenced this pull request Jul 6, 2023
@Cheackraze
Merge pull request space-wizards#4
2893165 
Cloningmisc
CaptainSqrBeard pushed a commit to CaptainSqrBeard/space-station-14 that referenced this pull request Jul 7, 2023
@AruMoon
Локализация! space-wizards#4
44366d6
CaptainSqrBeard pushed a commit to CaptainSqrBeard/space-station-14 that referenced this pull request Jul 7, 2023
@AruMoon
Merge branch 'master-ru' into 'master-ru'
e457a4b 
Локализация! space-wizards#4

See merge request Workbench-Team/space-station-14!86
LankLTE pushed a commit to LankLTE/space-station-14 that referenced this pull request Feb 16, 2024
@Aexxie
Merge pull request space-wizards#4 from Umbra-Cosmatic-Drift/marking-…
43f9c35 
…changes

Marking changes
sampletestboy2 pushed a commit to sampletestboy2/space-station-14 that referenced this pull request Feb 29, 2024
@mirton14
Merge pull request space-wizards#4 from ArturUr1/Special-Officer-outfit
1f141d2 
Офицер Специальных Операций
c4llv07e pushed a commit to c4llv07e/space-station-14 that referenced this pull request Mar 24, 2024
@RumiTiger
Merge pull request space-wizards#4 from c4llv07e/rumi_fix
6e53d1a 
New sprites, fix prototypes
Nimfar11 pushed a commit to Nimfar11/space-station-14 that referenced this pull request Apr 14, 2024
@TheShuEd
Merge pull request space-wizards#4 from crystallpunk-14/flora-pack
0646bf1 
Немного визуала
SlamBamActionman referenced this pull request in SlamBamActionman/space-station-14 May 8, 2024
@TsjipTsjip
Merge pull request #4 from Sector-Umbra/upstream-merge
70d835b 
Upstream merge
Hanzdegloker pushed a commit to Hanzdegloker/space-station-14 that referenced this pull request May 12, 2024
@Jezithyr
Merge pull request space-wizards#4 from nikthechampiongr/singleton_wo…
c148cd0 
…unds

Add Unique wounds for woundables
dffdff2423 pushed a commit to dffdff2423/space-station-14 that referenced this pull request May 31, 2024
@bhenrich
remove train from standart rotation (space-wizards#4)
c6c98ee
Doctor-Cpu added a commit to Doctor-Cpu/space-station-14 that referenced this pull request Jul 20, 2024
@Doctor-Cpu
Merge pull request space-wizards#4 from Doctor-Cpu/chef
c11ef69 
cloth burger
@Plykiya Plykiya mentioned this pull request Aug 6, 2024
Open
2 tasks
iaada pushed a commit to iaada/space-station-14 that referenced this pull request Sep 2, 2024
@AirFryerBuyOneGetOneFree
Merge pull request space-wizards#4 from medabunny/master
b476d13 
Merge with upstream
SlamBamActionman referenced this pull request in SlamBamActionman/space-station-14 Sep 4, 2024
@KeldWolf
Merge pull request #4 from ss14-harmony/add_rules
0f4c900 
Just moving the rules to the new location. This isn't taking into aco…
@Golinth Golinth mentioned this pull request Nov 26, 2024
Open
2 tasks
@0tito 0tito mentioned this pull request Dec 9, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PJB3005 PJB3005 PJB3005 approved these changes

@ZoldorfTheWizard ZoldorfTheWizard ZoldorfTheWizard approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Acruid @ZoldorfTheWizard @PJB3005