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

39 commits

Author SHA1 Message Date
Morb0
851de247ea Update box styles 2023-05-07 12:52:07 +03:00
Morb0
45cde15648 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-05-07 12:51:16 +03:00
brainfood1183
d598ada16f
Omega Cartridges Uplink rounds for CHIMP. (#15755) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-02 16:11:04 +10:00
Morbo
3ed1fcd6da Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
 2023-04-26 14:23:40 +03:00
brainfood1183
5f9c6e6ee3
[entity] jonk bot 
* jonkbot

* copyright

* fix

* fix
 2023-04-23 20:32:32 -06:00
Morbo
1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
 2023-04-23 16:02:09 +03:00
AsikKEsel
dce680065d
[Entity] Add new medals (#15577) 
* Add 6 new medals

* Update medalcase.yml

* Update medals.yml

* Update medalcase.yml
 2023-04-20 17:54:31 -06:00
Morb
bc4015f651
Bunch of resprites (#996) 2023-04-19 00:22:44 -07:00
Morbo
5a14c570aa Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
#	Resources/Prototypes/typing_indicator.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
 2023-04-15 19:12:31 +03:00
deltanedas
2b14e9a99b
[Tweak] Syndi pens are bought in boxes now (#15190) 
* pens are bought in wrappers now

* pro

* maybe

* pro

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-12 12:44:52 -06:00
Morbo
f6ab2487a0 Update boxes sprites 2023-04-02 10:35:02 +03:00
Morbo
a3760d5656 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml
#	Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-04-02 09:15:19 +03:00
potato1234_x
6bfd1d8f11
Missing box icons (#14891) 
* boxes

* holo box
 2023-03-30 22:46:06 -06:00
brainfood1183
ad31749b55
Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. (#14973) 
* deskbell, poster rise fix, happyhonk mime inhand fix.

* cancollide: false
 2023-03-30 22:32:57 -06: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
lapatison
2257bd3862
Encryption key boxes to the heads lockers. (#14110) 2023-03-05 22:32:08 -04:00
Morbo
f3bd98ceed Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Content.Shared/Humanoid/HumanoidComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
 2023-01-25 22:46:52 +03:00
brainfood1183
6654558046
happy honk meal box dispenser (#13490) 2023-01-22 21:08:16 -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
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
3af5b83703 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
 2022-10-18 21:23:46 +03:00
Nairod
50d8ed6c89
Spare headsets for the HoP (#11954) 
* textures and fill yml

* texture meta edit

* box id fix, locker fill, vendor fill

* whitelist fix
 2022-10-16 13:21:02 -05:00
Morb
0d984a2665
Update nitrile box icon (#417) 2022-09-25 17:54:33 -07:00
Morbo
143d408c81 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
 2022-09-16 19:22:52 +03:00
Illiux
3722106cd4
Add 2 bottle boxes to chemistry lockers (#11298) 2022-09-15 08:17:32 -05:00
Morber
31e98277f6
[Resprite] Boxes (#322) 
* Update boxe sprites

* Remove box_id.png & add id icon & use id instead of pda

* Add & use medical box

* Update license.txt
 2022-07-23 12:50:42 +03:00
Peptide90
79c265efb3
Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607) 
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
 2022-06-03 22:05:18 -07:00
EmoGarbage404
d953f88530
MRE boxes (#7726) 2022-04-30 14:24:37 -07:00
ZeroDayDaemon
4926bc7cda
Gas Masks, Oxygen Tank Correction, and Correct Fills for lockers and survival boxes (#7589) 
* gas mask and oxy and fills and stuff

* Update masks.yml

* Update masks.yml

* i think this is right

* bag variants fill fix

* syndicate gas mask

* Update emergency.yml
 2022-04-21 22:11:26 +10:00
Peptide90
bcfb72519c
Adds boxes of all magazine types + box of trashbags and flares (#6891) 2022-02-27 12:56:27 -07:00
Lamrr
27c16edb54
Adds shotgun shell boxes (#6195) 2022-01-22 13:47:54 -07:00
Zymem
5e1477c91a
Adds briefcase (#6196) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
 2022-01-17 12:21:28 -07:00
Mith-randalf
050516c17e
Zipties (#5727) 2021-12-13 22:17:26 -07:00
Swept
6376e60b78
Massive Food PR (#3436) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2021-05-03 13:17:22 +02:00
Swept
ece403ca57
Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
Elijahrane
590453a57f
Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Swept
a57db85208
Swept commits JSON genocide. (#2991) 
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
 2021-01-13 23:04:38 +11:00
Swept
7790f8f6f6
Adds hugbox. (#2826) 
* Box and sprites

* Added to clowns fills
 2020-12-27 19:24:08 +11:00
Swept
e3ace03cad
Boxes (and sterile mask) (#1964) 
* Added sprites and lights, handcuffs and PDA box.

* Syringe and Beaker

* Adds flashbang latex and a sterile mask

* Adds a box to store those sterile masks

* Adds donkpocket box WHY WASN'T THIS IN ALREADY I'LL KILL YOU ALL AHHHHH

* Makes inhand boxes grey

* Security boxes now have proper layer

* Adds meson, sechud, and better inhands

* Adds survival box (no o2 can or injector because they're not included yet

* Adds survival box sprites

* Blank commit

* Adds filled backpacks for starting-gear

* Moves filled backpacks to a sensible place

* Builds now

* Fixes rsi
 2020-09-03 23:13:45 +02:00