NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-19 07:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
11739 commits 14 branches 0 tags 2.9 GiB
Commit graph

28 commits

Author SHA1 Message Date
Arthur
075299b54d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
 2022-07-22 22:45:30 +03:00
Myctai
a29749ed4c
Perform CentCom-ification (#9876) 
* Change "CentComm" to "CentCom"

* Change "Centcomm" to "CentCom", skipping CVar and changelog

* Change "Centcom" to "CentCom", skipping lots of item IDs

* Change "centcomm" to "CentCom", skipping URLs, some var, IDs

* Change "centcom" to "CentCom", skipping IDs and alike
 2022-07-19 21:08:24 -07: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
metalgearsloth
77a8e16104
Add cargo shuttle (#8686) 2022-06-23 14:36:47 +10:00
lapatison
05ddf4715c
Различные переводы (#258) 
* Update toys.ftl

* Update signs.ftl

* Update syndicate.yml

* Update tools.ftl

* Update cowtools.ftl

* Update bedsheets.ftl

* Update Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl

Co-authored-by: Morber <14136326+Morb0@users.noreply.github.com>

* Update bedsheets.ftl

* Update bedsheets.ftl

Co-authored-by: Morber <14136326+Morb0@users.noreply.github.com>
 2022-06-16 20:30:35 +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
lapatison
93b18e264c
Перевод датасетов имён (#242) 
* Update military.yml

* Update reptilian_male.yml

* Update reptilian_female.yml
 2022-06-09 19:32:17 +03:00
Pancake
3c7aebab1d
Syndicate Names (#8692) 
* Syndicate Names

* Update syndicate.yml

* Update NukeopsRuleSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-07 13:41:22 +10:00
T-Stalker
680636dea3
chr (#8674) 
* weh

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

* chr

chr

* Update chair.yml

* Update chairs.yml
 2022-06-07 12:14:39 +10:00
Arthur
fee8678a41 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Maps/game.yml
 2022-06-04 03:08:27 +03:00
Peptide90
b93286fc61
Emergency Response Team (#6258) 
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
 2022-06-03 20:48:28 +10:00
Arthur
82c0b1c8e7 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-15 16:38:40 +03:00
T-Stalker
d750e7b599
Lizard name datasets (#7890) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 16:43:15 -07:00
Arthur
6ca4c0ceb8 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/species.yml
#	Resources/manifest.yml
 2022-05-07 05:32:09 +03:00
Kara
f361618a0b
Random metadata component (#7894) 
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
 2022-05-02 13:51:03 -07:00
Arthur
b278ab0437 Merge remote-tracking branch 'upstream/master' into upstream 2022-01-18 12:13:44 +03:00
Peptide90
335c2e422f
Dataset names purge (#6037) 2022-01-17 12:24:58 -07:00
Morbo
5606ecb519
Translate traitor codewords to russian (#72) 2022-01-17 17:23:32 +03:00
Arthur
8789332f5e Translate first and last name to russian & split last name by gender 2021-12-15 06:57:20 +03:00
Kara D
2744b67539
Remove probably offensive deathsquad names 
im pretty sure this kinda shit is why the tg repo got randomly deleted that one time so i dont wanna take chances
 2021-11-18 16:33:51 -07:00
SweptWasTaken
fa808cb220 Converts all cargo IDs to camelCase and deletes unused/outdated cargo Dataset. 2021-06-11 16:38:02 -07:00
SweptWasTaken
a9121b1d6d Updates all cargo IDs to code quality guidelines 2021-06-11 16:19:14 -07:00
Swept
45a09bc7ea
Nerfs cargos minimum starting balance (#3468) 
* e

* Aight

* Done
 2021-03-01 12:56:38 -08:00
Swept
4a67fc1d22
Fleshes out smoking content (#3295) 
* RSIs sorted out

* Bookmark

* Updated packet RSIs for Stacks

* Cigs Packs done

* Cigarette Cartons

* fucking MANUALLY fixed the cigarette inhands, fuck you tgstation

* Pipes work

* Cigars/Cases

* Updates vending machine inventory

* tweaks count

* Adds a cigarette crate

* Fixes RSIs, working on rolling paper

* Adds Tobacco and Cannabis plants

* Cigarettes and Rollies are now craftable

* There

* Fixed crafting recipes

* Reset RobustToolbox

* Netsync'd

* Ready

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2021-02-22 15:08:17 +11:00
Pieter-Jan Briers
295de8f114 Fix autoborg properly. 2021-01-15 10:51:29 +01:00
Swept
3079ddd962
Fixes autoborg names dataset. (#3006) 
* Initial

* Adds Recyclable to ignore

* .
 2021-01-15 16:36:48 +11:00
Paul Ritter
ce096f9c51
ports over datasets (#2663) 
* ports over datasets & ignores the dataset prototype clientside

* moved dataset to shared

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
 2021-01-14 18:08:55 +11:00
Paul Ritter
f7c09fbd7e
Traitor (#2566) 
* basic implementation

* minor fixes

* objectives temp commit

* proper onstart bind

* changes all conditions to be bound to a mind-instance

* oops

* oops v2

* adds possiblity to enable duplicate assignment of objective
equal objectives are unable to be added

* minor fixes, adds greentext

* refactors incompatability to be defined by requirements

* fixes a wrong whitespace

* minor fix

* addressed reviews v1

* address reviews v2

Co-authored-by: Exp <theexp111@gmail.com>

* final sweep

* adds/refactors traitor&sss cvars

* Update Content.Server/Mobs/Mind.cs

* never trust github web

* adds datasets & makes codewords use them

* addresses exp's reviews

* addressed zumos reviews

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: Exp <theexp111@gmail.com>
 2020-12-01 17:05:19 +01:00