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

2005 commits

Author SHA1 Message Date
Arthur
907e7464ff Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-10 09:27:57 +03:00
Leon Friedrich
7549adf2f4
Reduce verb menu pop-in / rearranging (#6611) 2022-02-10 14:27:34 +11:00
Leon Friedrich
1c9ffdc78c
Replace VerbTypes with verb classes (#6525) 2022-02-10 13:30:59 +11:00
Leon Friedrich
7efb1c81eb
Tweak solution editing window (#6587) 2022-02-10 13:05:45 +11:00
mirrorcult
b96cee4fd5
Convert ItemCabinet to use a VisualizerSystem (#6571) 2022-02-10 12:53:44 +11:00
Acruid
cd9cc17339
Adds gratuitous logging to AlertsUI for debugging. (#6574) 2022-02-10 12:32:57 +11:00
Leon Friedrich
4db7fc1bf0
Fix minor clickmap bug (#6596) 2022-02-10 02:37:00 +11:00
Arthur
68e47a8ac5 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Server Info/Rules.txt
 2022-02-09 08:40:52 +03:00
Leon Friedrich
8a1fd92e2b
Hide Targeting Dummy (#6580) 2022-02-08 21:25:12 -07:00
WlarusFromDaSpace
50b1af08a2
Adds emergency access to airlocks (#6500) 2022-02-09 14:13:35 +11:00
Leon Friedrich
0e4c7e67ab
Redo ClickableComponent (#6221) 2022-02-09 13:11:06 +11:00
Acruid
d89df7ce74
Move ButtonBar view out of GameHud into GameHud.ButtonBar (#6491) 2022-02-09 11:24:22 +11:00
Fishfish458
997a500fc3
Add inflatable door (#6393) 
Co-authored-by: fishfish458 <fishfish458>
 2022-02-08 14:54:14 -07:00
mirrorcult
31769edf5f
Decal Placer + add new decals for mapping (#6548) 
* abomination

* okay its less unabashedly garbage now

* other UI changes

* its britney bitch

* proper greyscale full/half/quarter tiles

* misc cleanup

* rsi

* Add a palette system. It's Kara's problem now.

* oops

* a

* Departmental palette alpha tweaks

* oopy

* so true

* Update Content.Shared/Decals/ColorPalettePrototype.cs

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

* fixes for that

* neutral light color and new warning lines

* dirt

* checkerboards

* oop

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-02-08 14:54:41 -06:00
hubismal
1c6df07086
Fires burn bright (#6516) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-02-08 21:43:33 +11:00
TheDarkElites
8c47d6103f
Add PDA Ringtones (#5842) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-02-08 20:39:23 +11:00
Arthur
f8cf1e29b1 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-08 08:27:12 +03:00
metalgearsloth
310f6e14f1
Portable flasher tweaks (#6517) 2022-02-08 14:08:21 +11:00
metalgearsloth
70c0a502cf
ECS tags (#6504) 2022-02-08 14:08:11 +11:00
Arthur
583caf2d76 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-07 20:31:46 +03:00
metalgearsloth
f9e32fb0c1
Revert "Add support for multi-layer in-hand and clothing sprites" (#6521) 2022-02-07 14:59:22 +11:00
Leon Friedrich
470e4f8bdc
Add support for multi-layer in-hand and clothing sprites (#6252) 2022-02-07 14:37:57 +11:00
Alex Evgrashin
617f92df65
More xeno artifacts effects (#6282) 2022-02-06 19:26:10 -07:00
Arthur
85694b8513 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-07 01:38:12 +03:00
ScalyChimp
3c9328ff99
Adds portable flasher (#4523) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-02-07 02:59:41 +11:00
metalgearsloth
627cbba2b6
Crayons ECS (#6364) 2022-02-06 23:32:32 +11:00
mirrorcult
d5b8449edb
Global usings (#6472) 2022-02-05 11:39:36 -07:00
WlarusFromDaSpace
11eb591c54
Adds door remotes from SS13 (#6335) 2022-02-06 00:33:24 +11:00
Arthur
01af9d9e15 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
 2022-02-05 12:20:28 +03:00
Willhelm53
4d3a381962
Mopping Puddle Dilution and Wet Floor Sparkles (#6273) 2022-02-04 19:26:11 -07:00
Arthur
d2c978f009 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Maps/game.yml
 2022-02-02 21:04:06 +03:00
metalgearsloth
80727f7fa4
ECS cluster nades (#6368) 2022-02-02 18:04:38 +11:00
metalgearsloth
2e5808085d
Set mover velocity via system (#6288) 2022-02-02 17:34:25 +11:00
wrexbe
17db0775c8
Auto comp (#6416) 2022-02-02 14:35:40 +11:00
Ygg01
340158483b
Change width of dispensers (#6419) 2022-01-31 16:55:38 -07:00
Arthur
9b1ac3a997 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/game.yml
 2022-01-31 22:13:14 +03:00
Leon Friedrich
4614bb9877
Move static container helper functions to container system (#6382) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-31 18:08:53 +11:00
mirrorcult
a055ec3514
Port the Mass Scanner from OR14 (#6172) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-31 16:38:11 +11:00
Fishfish458
b837b186a5
Attempted Small Vending Machine Refactor (#6157) 
Co-authored-by: fishfish458 <fishfish458>
 2022-01-31 15:16:41 +11:00
Julian Giebel
305cff2659
Implement ECS alternative for IDragDropOn and fully ECS disposal units (#6380) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-31 03:53:22 +11:00
Leon Friedrich
d40bcc9168
Fix some mispredict reconciliation issues. (#6319) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-31 03:34:48 +11:00
Rane
8070fce5e7
Gives Chaplain their Bible 🙏 (#6269) 2022-01-31 02:20:22 +11:00
Rane
b360f80da5
Fixed inconsistent tiles, rebalanced explosives (#6339) 2022-01-31 01:34:11 +11:00
ScalyChimp
004c678853
Incediary Shells (#6208) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-01-31 00:44:45 +11:00
metalgearsloth
b5724feb27
ECS guns (#6229) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-30 17:39:46 +11:00
Leon Friedrich
47e597ca47
Predict inventory slot interactions. (#6033) 2022-01-30 11:50:10 +11:00
Leon Friedrich
c465715273
ECS Doors (#5887) 2022-01-30 11:49:56 +11:00
Arthur
7fbaf3ee95 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-01-29 21:52:08 +03:00
Alex Evgrashin
2a68023143
Move WindowComponent to ECS (#6267) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-01-29 16:21:38 +11:00
Aaron Mell
f77ac6c4f3
Removed SetSize from Window Size in Admin and AdminRank (#6362) 2022-01-29 16:20:26 +11:00