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

Adds blinding + blindfolds #8688

Merged
merged 13 commits into from
Jul 12, 2022
Merged

Adds blinding + blindfolds #8688

merged 13 commits into from
Jul 12, 2022

Conversation

Elijahrane
Copy link
Contributor

@Elijahrane Elijahrane commented Jun 6, 2022 •
edited
Loading

About the PR

Works on my machine.

Screenshots

2022-06-06.18-44-43.mp4

Changelog

🆑 Rane

  • add: Added blindfolds!
  • add: Added a rare, funny salvage item.

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Jun 6, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2022 •
edited
Loading

RSI Diff Bot; head commit d306e54 merging into 9e532bc
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Eyes/Misc/blindfold.rsi

State Old New Status
equipped-EYES Added
icon Added

Edit: diff updated after d306e54

@Emisse
Copy link
Contributor

Emisse commented Jun 6, 2022

finally some good erp content

@Elijahrane
Copy link
Contributor Author

Moved the checks to BeforeDraw which @ElectroJr added for fullscreen shaders

@wrexbe wrexbe added the S: Awaiting Changes Status: Changes are required before another review can happen label Jun 27, 2022
@Elijahrane Elijahrane requested a review from wrexbe June 27, 2022 21:29
@Elijahrane
Copy link
Contributor Author

Elijahrane commented Jun 27, 2022 •
edited
Loading

Addressed review, the new sussy bool/check is mitigating a renderer bug and preventing an exploit. Light manager needs a frame to turn off before we unblind them

@github-actions github-actions bot removed the S: Awaiting Changes Status: Changes are required before another review can happen label Jun 27, 2022
@wrexbe
Copy link
Contributor

wrexbe commented Jun 27, 2022

What if after the places you change blindComp.Sources
You raise a BlindedStateChangedEvent (or some other name)
Then on the BlindingSystem you subscribe to that event, and turn the light manager on/off, and add/remove the overlay
Then the overlay doesn't need to do any logic, and you can make all the blinding system subscriptions call an "UpdateBlindEffect" method.

@Elijahrane
Copy link
Contributor Author

Elijahrane commented Jun 27, 2022 •
edited
Loading

Then on the BlindingSystem you subscribe to that event, and turn the light manager on/off, and add/remove the overlay

The problem is that you need to change light manager one frame before the overlay. It needs some way to be timed like that

@wrexbe
Copy link
Contributor

wrexbe commented Jun 27, 2022

What do you know about this bug? Is it something that should be fixed, or a limitation?

@Elijahrane
Copy link
Contributor Author

Elijahrane commented Jun 27, 2022 •
edited
Loading

What do you know about this bug? Is it something that should be fixed, or a limitation?

Toggling light manager on/off takes place the next frame. During that frame you can see through walls. Deciding not to draw an overlay applies on the same frame. To sync them, we need to draw the overlay for an additional frame after we toggle the light manager.

This wasn't an issue in the original commit before we had BeforeDraw in overlays, but after implementing that there is a need for a delay. It should be worth it in terms of perf because toggling some bools is way cheaper than passing in the whole screen to do nothing like before.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jul 8, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2022

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jul 8, 2022
@wrexbe wrexbe self-requested a review July 12, 2022 05:33
@wrexbe
Copy link
Contributor

wrexbe commented Jul 12, 2022

The shader you were using does something different now on master, so I switched it to the other circle mask shader

@wrexbe wrexbe merged commit 7a7ab5e into space-wizards:master Jul 12, 2022
moonheart08 added a commit that referenced this pull request Jul 13, 2022
Revert "Adds blinding + blindfolds (#8688)"
2765537 
This reverts commit 7a7ab5e.
moonheart08 added a commit that referenced this pull request Jul 13, 2022
Revert "Adds blinding + blindfolds (#8688)" (#9689)
a655891 
This reverts commit 7a7ab5e.
Elijahrane added a commit to Elijahrane/space-station-14 that referenced this pull request Jul 13, 2022
@Elijahrane
Adds blinding + blindfolds (space-wizards#8688)
077d4f8 
* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <[email protected]>
moonheart08 pushed a commit that referenced this pull request Jul 14, 2022
[2 lines] fix blinding (#9690)
83c03b6 
* Adds blinding + blindfolds (#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <[email protected]>

* resolve merge conflict

Co-authored-by: wrexbe <[email protected]>
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 1, 2022
@Elijahrane @Emisse
@ike709 @PJBot @TimrodDX @TekuNut @EmoGarbage404 @metalgearsloth @ElectroJr @Peptide90 @OldDanceJacket @mirrorcult @ShadowCommander @themias @IamVelcroboy @BurningRash @vulppine @gradientvera @Aerocrux @Ablankmann @Deahaka @Myctai @AJCM-git @Rinkashikachi @PJB3005 @moonheart08 @keronshb @wrexbe @Duddino @Delete69 @KIBORG04 @jessicamaybe @lapatison @sBasalto @TaralGit @Level10Cybermancer @Partmedia @ZeroDayDaemon @Morb0 @Kimpes
Merge0715 (space-wizards#267)
5fabbf0 
* Saltern Disablers (space-wizards#9492)

* Atlas Disablers (space-wizards#9493)

* Update hardsuits.yml (space-wizards#9494)

* Makes storage insertion failure more explicit (space-wizards#9465)

* Automatic changelog update

* Disablers on Delta (space-wizards#9509)

* Disablers on Waystation (space-wizards#9510)

* Convert piped atmos entity visualizers (space-wizards#9200)

* Make explosive armor multiplicative and not additive (space-wizards#9498)

* Automatic changelog update

* Fix stunbaton stun sounds (space-wizards#9511)

* Add deletion checks to verb execution (space-wizards#9507)

* Fix pipe net null error (space-wizards#9508)

* Make ghost role names default to entity name (space-wizards#9478)

* Play tap.ogg when no damage is being done (space-wizards#9489)

* Automatic changelog update

* Splitstation Update 06 July 2022 (space-wizards#9495)

* Pillar Update (space-wizards#9504)

* Light Lighthouse Update (space-wizards#9503)

* Automatic changelog update

* Prevent erroneous materials from being placed in lathes. (space-wizards#9454)

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Disable ambience default again (space-wizards#9442)

* Emergency light goodies (space-wizards#9352)

Co-authored-by: Jacob Tong <[email protected]>

* Automatic changelog update

* Fix Practice Shotgun Shells (space-wizards#9516)

* Automatic changelog update

* Satiety tweaks (space-wizards#9519)

* Satiety tweaks

* actually lets do this

* Automatic changelog update

* Separate jetpack movement speed modifier (space-wizards#9363)

* Content changes required for recursive deletion changes (space-wizards#9316)

* Automatic changelog update

* Textures to make lamps mappable to East/West. (space-wizards#9414)

Co-authored-by: Jeff <[email protected]>

* Pizza box 1984 (space-wizards#9521)

* Pizza box 1984

* todo

* Automatic changelog update

* Probably fix ghost overlays (space-wizards#9529)

* Fix & speed up explosion lookup (space-wizards#9526)

* Speed up explosion lookup

* Ah. Fuck.

* Disease Stages But Epic (space-wizards#9043)

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Adds station filter for alert level change sound (space-wizards#9533)

* FixVacuum does not replace tile air if there are no adjacent tiles. (space-wizards#9535)

* Fix adjacent tile atmosphere creation using the wrong coordinates. (space-wizards#9539)

* Automatic changelog update

* Make wieldable use entity position (space-wizards#9538)

* sprite fix (space-wizards#9542)

* Automatic changelog update

* Add SoftMaxPlayers to status response for launcher use (space-wizards#9365)

* Automatic changelog update

* Fix T-ray scanner flickering (space-wizards#9544)

* Automatic changelog update

* Fix a bunch of warnings (space-wizards#9528)

* BEHOLD! The MagiVend! (space-wizards#9440)

* Magivend Sprites, and Entity stuffs

* Oopsie!

* Automatic changelog update

* Dispense hot tea into teacup instead of glass (space-wizards#9541)

* Automatic changelog update

* Fireaxe resprite (space-wizards#9302)

* fieraxe

* traitor-fireaxe

* Automatic changelog update

* Marathon Update 2.4 (space-wizards#9553)

* Fix space-wizards#9549

* Automatic changelog update

* Bullet impact effects (space-wizards#9530)

* Automatic changelog update

* Fix force-feeding pills (space-wizards#9554)

* Automatic changelog update

* China Lake Buff (space-wizards#9543)

* Automatic changelog update

* Shuttle announces its docking direction (space-wizards#9564)

* Shuttle announces its docking direction

* Consider COM juusssttt in case

* Fix nearby warping (space-wizards#9565)

* Automatic changelog update

* Jetpack QOL tweaks (space-wizards#9563)

* Automatic changelog update

* Fix drink system double-refunding solutions on failure (space-wizards#9569)

* Automatic changelog update

* Visual popup types (space-wizards#9523)

* Visual popup types

* Pass over `PopupCoordinates` and `PopupCursor`

* `PopupEntity` pass

* Disease and reagent popup pass

* COLOUR

* Automatic changelog update

* Specifiable dock colours + stripeback displays (space-wizards#9566)

* Visual popup addendum (space-wizards#9570)

* Add egg laying + chicken/duck improvements (space-wizards#9518)

* Disable emergency light ambience by default (space-wizards#9571)

* splitstation minor update (emergency lights) (space-wizards#9572)

* Making smites funnier (space-wizards#9524)

* Automatic changelog update

* Bagel E Lights (space-wizards#9573)

* Update submodule (space-wizards#9574)

* Injector sprite fix (space-wizards#9011)

* Automatic changelog update

* marathon e lights (space-wizards#9575)

* Change yellow alert elight color to goldenrod (space-wizards#9577)

* Evac Shuttle Fans (space-wizards#9578)

* Order manifests for shuttle orders. Now with item names and approver info. (space-wizards#9464)

Co-authored-by: Kara <[email protected]>

* Automatic changelog update

* Marathon Ore Processor and misc (space-wizards#9580)

* Kudzu nerf (space-wizards#9576)

* Automatic changelog update

* Convert Remaining Atmos Appearance Visualizers (space-wizards#9582)

* Convert atmos plaque to generic visualizer

Use generic visualizer for atmos plaque. Also enables zumos plaque to
appear.

* Convert gas canister connecters

* Remove manual layer creation

* Remove gas canister visualizer

* Convert gas analyzers to generic visualizers

* Convert fire visualizer

* Fix layers on plasma and air canisters

* Remove commented out fire visualizer in barricades

* Add documentation for fire visuals component

* Remove redundant visualizer for milkalyzer

* Remove rogue item group

* Knock on shutters (space-wizards#9586)

* Automatic changelog update

* Update battery_guns.yml (space-wizards#9581)

* Automatic changelog update

* Shards damage barefoot users + steptrigger-related general cleanup (space-wizards#9585)

* Automatic changelog update

* Client command perms cleanup. (space-wizards#9599)

* Update identification_cards.yml (space-wizards#9603)

* public method to add/subtract from cargo bank account (space-wizards#9614)

* Forensics QOL (Autolabeling of pads and reports) (space-wizards#9610)

* Automatic changelog update

* Allow non-humanoid roles (space-wizards#9604)

* Fix medical techfab and add unused bodybag recipe to it (space-wizards#9607)

* bodybags printable in medical techfab

* fix medical techfab

* Automatic changelog update

* Lamp Plushie (space-wizards#9118)

* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml

* Id[entity] 2.0 (real) (space-wizards#9612)

* starter API

* network ID cards

* Port more stuff from old identity

* Re-implement identity representation + name updating

* move

* proper name returning for `IdentityName`

* move everything important to server, give in to  temptation

* shared / server / client split sadly. move ensure to shared and spawn to server

* identity update queueing + identityblocker

* fixes

* and just like that it's usable for admins

* huge identity pass

* pass dos

* jesus christ

* figs :D

* fuck u

* fix bad merge.

Co-authored-by: Moony <[email protected]>

* Automatic changelog update

* Event refactor (space-wizards#9589)

* Station event refactor

* Remove clientside `IStationEventManager`

we can just use prototypes

* Basic API idea

* Cruft

* first attempt at epicness

* okay yeah this shit is really clean

* sort out minor stuff

* Convert `BreakerFlip`

* `BureaucraticError` + general cleanup

* `DiseaseOutbreak`

* `FalseAlarm`

* `GasLeak`

* `KudzuGrowth`

* `MeteorSwarm`

* `MouseMigration`

* misc errors

* `PowerGridCheck`

* `RandomSentience`

* `VentClog`

* `VentCritters`

* `ZombieOutbreak`

* Rewrite basic event scheduler

* Minor fixes and logging

* ooooops

* errors + fix

* linter

* completions, `RuleStarted` property, update loop fixes

* Tweaks

* Fix space-wizards#9462

* Basic scheduler update fix, and fixes space-wizards#8174

* Add test

* UI cleanup

* really this was just for testing

* Fixes Blocking bugs (space-wizards#9424)

* Fixes Riot shield bugs

* Removes redundant check and extra parenthesis

* Requested changes

* Prevent block with another shield if already blocking.

* Automatic changelog update

* Fix space mob burning (space-wizards#9615)

* Small identity fixes (space-wizards#9617)

* More nukie tweaks (space-wizards#9618)

* Automatic changelog update

* Fixed typo in lobby (space-wizards#9630)

* Automatic changelog update

* Actually include clientCommandPerms.yml in client builds. (space-wizards#9632)

* Automatic changelog update

* Do not hardcode salvage magnet channel (space-wizards#9633)

* Fixed PDA not spawning with the correct light (space-wizards#9623)

* Fixed PDA not spawning with the correct light

* Fixed indentation

* Forgot I had to use camelCase

* Automatic changelog update

* Fix a bug where toggleready returns an exception when provided with the wrong number of arguments (space-wizards#9631)

* Use map coordinates for spraying (space-wizards#9505)

* Adds blinding + blindfolds (space-wizards#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <[email protected]>

* Automatic changelog update

* Cleans up warning line decals (space-wizards#8731)

* letsa go

* indentations

* added back old decals

* this thing

* maybe this

* jfc

* Toilet fixes (space-wizards#9609)

* Automatic changelog update

* Update misleading Phalanximine description to accurate one (space-wizards#9625)

* Automatic changelog update

* Kvass (space-wizards#9082)

* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json

* Automatic changelog update

* Clarify on ways to get help from other players (space-wizards#9627)

* Update DiseaseTest (space-wizards#9639)

Effects / cures are indices not the threshold

* Probably fix thirst mispredict (space-wizards#9656)

* Probably fix thirst mispredict

* thanks rider

* Fix interaction outline jankiness at high speeds (space-wizards#9653)

Converting mouse to eye pos is better done after the eye has its frameupdate.

* Automatic changelog update

* Food and Beverage Spawners (space-wizards#9547)

* Textures to make lamps mappable to East/West.

* Adds various rng food and beverage spawners for mapping. Also adds a smaller icon for rndm arcade machine because the other was triggering people.

* Fix

* ugh

* edits

* Oops, missed a couple xenos

Co-authored-by: Jeff <[email protected]>

* Add admin verb for respawning a player (space-wizards#9666)

* You can now unanchor and destroy the robot showcase (space-wizards#9668)

* Automatic changelog update

* Cargo Shuttle Update (space-wizards#9679)

* Revert "Fireaxe resprite" (space-wizards#9676)

* Revert "Adds blinding + blindfolds (space-wizards#8688)" (space-wizards#9689)

This reverts commit 7a7ab5e.

* EntityStorage ECS (space-wizards#9291)

* Automatic changelog update

* Update ContainerOcclusionTest.cs (space-wizards#9692)

* Identity fixes (space-wizards#9701)

* Healing tweaks (space-wizards#9697)

* Automatic changelog update

* Generic morgue visualizer (space-wizards#9696)

* Remove IActivate (space-wizards#9705)

* git mv

* purge IActivate

* File scoped NS

* Update misc.yml (space-wizards#9691)

* cltohes (space-wizards#9680)

* Update submodule to 0.28.5.0 (space-wizards#9708)

* mathaotnont (space-wizards#9711)

* bagl... (space-wizards#9710)

* Traitor deathmatch ecs (space-wizards#9714)

* salty (space-wizards#9712)

* Machine frame ECS (space-wizards#9713)

* Entity storage whitelist (space-wizards#9694)

* Update common color to station announcements (space-wizards#9670)

* Atlas Update 1.6 (space-wizards#9709)

* Automatic changelog update

* Update shards.yml (space-wizards#9644)

* Remove `IInteractUsing` (space-wizards#9718)

* Automatic changelog update

* Remove `IAfterInteract` (space-wizards#9715)

* remove gas analyzer iafterinteract

* solution transfer + obsolete

* cuffable

* remove

* dart becomestation comp fix (plus render) (space-wizards#9497)

* dart becomestation comp fix

* minor fixes and changes to ERT shuttle Dart

* Hospital curtains add (space-wizards#9707)

* curtainss

* sound_mono

* hotfix_curtains

* Automatic changelog update

* [2 lines] fix blinding (space-wizards#9690)

* Adds blinding + blindfolds (space-wizards#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <[email protected]>

* resolve merge conflict

Co-authored-by: wrexbe <[email protected]>

* Automatic changelog update

* Re-implement recoil (space-wizards#9406)

* Re-implement recoil

Playing around with the values atm

* Update constants

* final tweaks

* Automatic changelog update

* Fix zombie percent in the round end summary (space-wizards#9682)

* Make controlmob not require sentience (space-wizards#9479)

* Outer clothing nerf (space-wizards#9143)

* Reduced backpack to 99 size from 100

* Increase hardsuit and softsuit size

* Adds ClothingOuterBaseLarge

* Parenting

* Changed parent base, reduced duplication

* 101 the people have spoken

* 100 backpack cry

* Changes some things to large base 60

* Updates armour based to large

* Large base slowdown 20%

* Speed boost

* Removed syndie eva box

Duffel exists, no need

* Apparently this is an eva suit

* Fixed formatting

* Syndie duffel boosted to 131

To fit a hardsuit plus mask and gas

* Hardsuits to 121 size

No more bagging

* Made heavy clothing 80

* moves syndie eva box to a duffel

* Automatic changelog update

* Muzzle flash enhancements (space-wizards#9527)

* Automatic changelog update

* remove 1 taser (space-wizards#9725)

* Remove some tasers (space-wizards#9727)

* Packed Station Update (space-wizards#9722)

* RPG-7, Kardashev rifle and Hristov heavy sniper resprites (space-wizards#9729)

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

* Guard against weird renderer bug (space-wizards#9720)

* Make disposal pipes use generic visualizer (space-wizards#9672)

* Automatic changelog update

* Add AMIV disease stages (space-wizards#9637)

* Add AMIV disease stages

* remove unused import

* move stages to top for readability

* monkey immunity to amiv

* Update to use time instead of index

* Revert "Update to use time instead of index"

This reverts commit 6bc83b0.

* add comments

* rerun test

* Automatic changelog update

* Fix bricked welding component (space-wizards#9741)

* Automatic changelog update

* Make entity storage lookup range positive (space-wizards#9735)

* Automatic changelog update

* Add uplink command completions (space-wizards#9742)

* Remove telekinesis (space-wizards#9737)

* Add batch cooking (space-wizards#9359)

* Automatic changelog update

* Prevent content from overriding sprite shader (space-wizards#9036)

* Fix disappearing decals bug (space-wizards#9608)

* Automatic changelog update

* Make flash prevent handheld light toggle (space-wizards#9448)

Co-authored-by: Kara <[email protected]>

* Bring pills back to 50 units maximum (space-wizards#9626)

* Adds a nuclear pinpointer to the operative and medic operative duffel fills (space-wizards#9634)

* Nerf disease outbreak (space-wizards#9640)

* Automatic changelog update

* Make sure dragdrop doesn't delay by a frame (space-wizards#9745)

* Vapor tweaks (space-wizards#9638)

* Magic staves + wands (space-wizards#9070)

* Automatic changelog update

* Operating table add (space-wizards#9687)

* Automatic changelog update

* Fix loadbp window perm issue (space-wizards#9671)

* Steal condition tells you where to steal it from (space-wizards#9605)

* Automatic changelog update

* Add FTL destinations (space-wizards#9685)

* Job-specific traitor items (space-wizards#9601)

* Automatic changelog update

* Proto-kinetic accelerator (space-wizards#9748)

* Automatic changelog update

* Update submodule to 0.28.5.1 (space-wizards#9750)

* Reduce radar minimap radius (space-wizards#9673)

* Ghost role probability (space-wizards#9752)

* Ghost role probability

* give it to regular ticks/bears too

* Automatic changelog update

* Smooth radar zooming (space-wizards#9753)

* Automatic changelog update

* Convert familiars to GhostRoleMobSpawner (space-wizards#9525)

Co-authored-by: metalgearsloth <[email protected]>

* Port honkbots from nyano (space-wizards#9698)

* Automatic changelog update

* Identity popup fixes (space-wizards#9743)

* Automatic changelog update

* Bartending Tweaks (space-wizards#9307)

* Automatic changelog update

* Nuke ops war anounce sound (space-wizards#9035)

* Altars add (space-wizards#9678)

* Automatic changelog update

* Updated alarm sound effect (space-wizards#9756)

* Updated alarm sound

* Added Loop to alarm sound effect

* Automatic changelog update

* Bagel Update 14.3 (space-wizards#9757)

* Cargo shuttle qol and fixe (space-wizards#9759)

* Fix emergency shuttle docking (space-wizards#9758)

Woopsy

* Portable scrubbers (space-wizards#9417)

* Automatic changelog update

* fix up merge

Co-authored-by: Emisse <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: TimrodDX <[email protected]>
Co-authored-by: TekuNut <[email protected]>
Co-authored-by: Nemanja <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
Co-authored-by: OldDanceJacket <[email protected]>
Co-authored-by: Kara <[email protected]>
Co-authored-by: Jacob Tong <[email protected]>
Co-authored-by: themias <[email protected]>
Co-authored-by: ChilbroBaggins <[email protected]>
Co-authored-by: Jeff <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Flipp Syder <[email protected]>
Co-authored-by: Vera Aguilera Puerto <[email protected]>
Co-authored-by: Aerocrux <[email protected]>
Co-authored-by: Ablankmann <[email protected]>
Co-authored-by: Deahaka <[email protected]>
Co-authored-by: Myctai <[email protected]>
Co-authored-by: AJCM-git <[email protected]>
Co-authored-by: Marat Gadzhiev <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Moony <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: Duddino <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: Delete69 <[email protected]>
Co-authored-by: KIBORG04 <[email protected]>
Co-authored-by: Jessica M <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: sBasalto <[email protected]>
Co-authored-by: TaralGit <[email protected]>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Level10Cybermancer <[email protected]>
Co-authored-by: Kevin Zheng <[email protected]>
Co-authored-by: ZeroDayDaemon <[email protected]>
Co-authored-by: Morber <[email protected]>
Co-authored-by: Kimpes <[email protected]>
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 1, 2022
@Elijahrane @PJBot
@EmoGarbage404 @mirrorcult @ElectroJr @Emisse @metalgearsloth @lapatison @Peptide90 @Deahaka @sBasalto @TaralGit @themias @ShadowCommander @Myctai @Level10Cybermancer @Partmedia @ZeroDayDaemon @Morb0 @Kimpes @TimrodDX @gradientvera @sunbear-dev @13spacemen @moonheart08 @fooberticus @DoctorBeard @wrexbe @drakewill-CRL @OldDanceJacket @Ablankmann @PJB3005 @HoofedEar @Rinkashikachi @ike709 @vulppine @keronshb @DogZeroX
Merge0725 (space-wizards#289)
0130713 
* Automatic changelog update

* Update ContainerOcclusionTest.cs (space-wizards#9692)

* Identity fixes (space-wizards#9701)

* Healing tweaks (space-wizards#9697)

* Automatic changelog update

* Generic morgue visualizer (space-wizards#9696)

* Remove IActivate (space-wizards#9705)

* git mv

* purge IActivate

* File scoped NS

* Update misc.yml (space-wizards#9691)

* cltohes (space-wizards#9680)

* Update submodule to 0.28.5.0 (space-wizards#9708)

* mathaotnont (space-wizards#9711)

* bagl... (space-wizards#9710)

* Traitor deathmatch ecs (space-wizards#9714)

* salty (space-wizards#9712)

* Machine frame ECS (space-wizards#9713)

* Entity storage whitelist (space-wizards#9694)

* Update common color to station announcements (space-wizards#9670)

* Atlas Update 1.6 (space-wizards#9709)

* Automatic changelog update

* Update shards.yml (space-wizards#9644)

* Remove `IInteractUsing` (space-wizards#9718)

* Automatic changelog update

* Remove `IAfterInteract` (space-wizards#9715)

* remove gas analyzer iafterinteract

* solution transfer + obsolete

* cuffable

* remove

* dart becomestation comp fix (plus render) (space-wizards#9497)

* dart becomestation comp fix

* minor fixes and changes to ERT shuttle Dart

* Hospital curtains add (space-wizards#9707)

* curtainss

* sound_mono

* hotfix_curtains

* Automatic changelog update

* [2 lines] fix blinding (space-wizards#9690)

* Adds blinding + blindfolds (space-wizards#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <[email protected]>

* resolve merge conflict

Co-authored-by: wrexbe <[email protected]>

* Automatic changelog update

* Re-implement recoil (space-wizards#9406)

* Re-implement recoil

Playing around with the values atm

* Update constants

* final tweaks

* Automatic changelog update

* Fix zombie percent in the round end summary (space-wizards#9682)

* Make controlmob not require sentience (space-wizards#9479)

* Outer clothing nerf (space-wizards#9143)

* Reduced backpack to 99 size from 100

* Increase hardsuit and softsuit size

* Adds ClothingOuterBaseLarge

* Parenting

* Changed parent base, reduced duplication

* 101 the people have spoken

* 100 backpack cry

* Changes some things to large base 60

* Updates armour based to large

* Large base slowdown 20%

* Speed boost

* Removed syndie eva box

Duffel exists, no need

* Apparently this is an eva suit

* Fixed formatting

* Syndie duffel boosted to 131

To fit a hardsuit plus mask and gas

* Hardsuits to 121 size

No more bagging

* Made heavy clothing 80

* moves syndie eva box to a duffel

* Automatic changelog update

* Muzzle flash enhancements (space-wizards#9527)

* Automatic changelog update

* remove 1 taser (space-wizards#9725)

* Remove some tasers (space-wizards#9727)

* Packed Station Update (space-wizards#9722)

* RPG-7, Kardashev rifle and Hristov heavy sniper resprites (space-wizards#9729)

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

* Guard against weird renderer bug (space-wizards#9720)

* Make disposal pipes use generic visualizer (space-wizards#9672)

* Automatic changelog update

* Add AMIV disease stages (space-wizards#9637)

* Add AMIV disease stages

* remove unused import

* move stages to top for readability

* monkey immunity to amiv

* Update to use time instead of index

* Revert "Update to use time instead of index"

This reverts commit 6bc83b0.

* add comments

* rerun test

* Automatic changelog update

* Fix bricked welding component (space-wizards#9741)

* Automatic changelog update

* Make entity storage lookup range positive (space-wizards#9735)

* Automatic changelog update

* Add uplink command completions (space-wizards#9742)

* Remove telekinesis (space-wizards#9737)

* Add batch cooking (space-wizards#9359)

* Automatic changelog update

* Prevent content from overriding sprite shader (space-wizards#9036)

* Fix disappearing decals bug (space-wizards#9608)

* Automatic changelog update

* Make flash prevent handheld light toggle (space-wizards#9448)

Co-authored-by: Kara <[email protected]>

* Bring pills back to 50 units maximum (space-wizards#9626)

* Adds a nuclear pinpointer to the operative and medic operative duffel fills (space-wizards#9634)

* Nerf disease outbreak (space-wizards#9640)

* Automatic changelog update

* Make sure dragdrop doesn't delay by a frame (space-wizards#9745)

* Vapor tweaks (space-wizards#9638)

* Magic staves + wands (space-wizards#9070)

* Automatic changelog update

* Operating table add (space-wizards#9687)

* Automatic changelog update

* Fix loadbp window perm issue (space-wizards#9671)

* Steal condition tells you where to steal it from (space-wizards#9605)

* Automatic changelog update

* Add FTL destinations (space-wizards#9685)

* Job-specific traitor items (space-wizards#9601)

* Automatic changelog update

* Proto-kinetic accelerator (space-wizards#9748)

* Automatic changelog update

* Update submodule to 0.28.5.1 (space-wizards#9750)

* Reduce radar minimap radius (space-wizards#9673)

* Ghost role probability (space-wizards#9752)

* Ghost role probability

* give it to regular ticks/bears too

* Automatic changelog update

* Smooth radar zooming (space-wizards#9753)

* Automatic changelog update

* Convert familiars to GhostRoleMobSpawner (space-wizards#9525)

Co-authored-by: metalgearsloth <[email protected]>

* Port honkbots from nyano (space-wizards#9698)

* Automatic changelog update

* Identity popup fixes (space-wizards#9743)

* Automatic changelog update

* Bartending Tweaks (space-wizards#9307)

* Automatic changelog update

* Nuke ops war anounce sound (space-wizards#9035)

* Altars add (space-wizards#9678)

* Automatic changelog update

* Updated alarm sound effect (space-wizards#9756)

* Updated alarm sound

* Added Loop to alarm sound effect

* Automatic changelog update

* Bagel Update 14.3 (space-wizards#9757)

* Cargo shuttle qol and fixe (space-wizards#9759)

* Fix emergency shuttle docking (space-wizards#9758)

Woopsy

* Portable scrubbers (space-wizards#9417)

* Automatic changelog update

* Add public method to update cargo bank account (again) (space-wizards#9761)

* quickfix nukie uplinks (space-wizards#9765)

* Automatic changelog update

* Portable scrubbers on Delta (space-wizards#9771)

* Automatic changelog update

* Fix mob throwing (space-wizards#9775)

* Automatic changelog update

* The real movement refactor (space-wizards#9645)

* The real movement refactor

* ref events

* Jetpack cleanup

* a

* Vehicles partially working

* Balance tweaks

* Restore some shitcode

* AAAAAAAA

* Even more prediction

* ECS compstate trying to fix this

* yml

* vehicles kill me

* Don't lock keys

* a

* Fix problem

* Fix sounds

* shuttle inputs

* Shuttle controls

* space brakes

* Keybinds

* Fix merge

* Handle shutdown

* Fix keys

* Bump friction

* fix buckle offset

* Fix relay and friction

* Fix jetpack turning

* contexts amirite

* Automatic changelog update

* Update submodule to 0.28.6.0 (space-wizards#9776)

* Fix ghost movement (space-wizards#9778)

* Fix aghost (space-wizards#9781)

* Fixes makeshift laser using the wrong type of construction step. (space-wizards#9811)

It needed to use the "material" step, not the "prototype" step...

* Automatic changelog update

* Nukie planet update (space-wizards#9784)

* Error entity (space-wizards#9740)

Co-authored-by: tijn <[email protected]>

* Automatic changelog update

* Refactor set alert level command (space-wizards#9794)

* Adds Research, Virology, Glass Maint Airlocks (space-wizards#9350)

* Automatic changelog update

* Add a log to cut cables. How did this not exist before? (space-wizards#9780)

* Order permissions panel admins by username (space-wizards#9782)

* Fix aghost movement (space-wizards#9823)

* Don't relay incapacitated move inputs (space-wizards#9822)

* using existing FixedPoint2 for popup message, instead of raw float (space-wizards#9820)

Co-authored-by: fooberticus <[email protected]>

* Make shuttle brakes use thrusters and bandaid shuttle movement (space-wizards#9826)

* Automatic changelog update

* Make FTL arrive closer (space-wizards#9828)

* Automatic changelog update

* Fix docking control size (space-wizards#9833)

* Saltern Update 4.0 (space-wizards#9838)

* a (space-wizards#9837)

* make nukies actual antags (space-wizards#9844)

* Automatic changelog update

* Remove ranged injection/feeding (space-wizards#9841)

* Automatic changelog update

* Packed In  (space-wizards#9760)

* Update packedstation.yml

* Update atlas.yml

* packed...,,,

* packed..,,,

* e (space-wizards#9835)

* allow decals to be removed from placement menu (space-wizards#9843)

* Port cleanbots from Nyano (space-wizards#9853)

* Automatic changelog update

* Remove overfed/overhydrated alerts (space-wizards#9852)

* Automatic changelog update

* Add gravitycomponent support to maps (space-wizards#9857)

* Add gravitycomponent support to maps

The alert still needs fixing if you want planets.

* move

* Packed Fixe (space-wizards#9859)

* More Packed Fixe... (space-wizards#9874)

* packed fixe...

* society....

* Removed lifetime handling from ImmovableRod and added TimedDespawnComponent to the prototype instead (space-wizards#9870)

* Damage overlay fixes (space-wizards#9831)

- Fix death overlay showing when returning to body.
- Made the diff non-linear.

* Fix blindfold round cleanup bug (space-wizards#9821)

* Blindness public api

* fix blinding round cleanup bug

* Automatic changelog update

* Update submodule to 0.29.0.0 (space-wizards#9881)

* Update submodule to 0.29.1.0 (space-wizards#9886)

* Announce shuttle direction on proximity (space-wizards#9885)

* Automatic changelog update

* Add public sex method for those who don't have access to change sex (space-wizards#9894)

* The nuke must be anchored to arm. (space-wizards#9898)

* Automatic changelog update

* Perform CentCom-ification (space-wizards#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

* Automatic changelog update

* botany slight rebalance (space-wizards#9766)

* Automatic changelog update

* Add under-pressure lockout to air vents (space-wizards#9824)

* Add under-pressure lockout to vent pumps

* Add examine text showing UPLO

* Automatic changelog update

* Fix content test warnings (space-wizards#9865)

* Fix content test warnings

* while I'm here

* fix

Co-authored-by: wrexbe <[email protected]>

* Stabalize tests (space-wizards#9901)

* Antag menu (space-wizards#9900)

* Refactor traitor generation code.

* RandomTraitorAlive no longer crashes when 1 traitor. Also cleaner/faster

* Add Antag menu for admins, add Traitor to the list.

* Add zombie to admin-antag menu

* Pirates, lone op, make traitor consistent with the rest.

* Add name strings

* cleaned usings.

* Cleanup.

Co-authored-by: drakewill <drake@drakewill-crl>
Co-authored-by: moonheart08 <[email protected]>

* Automatic changelog update

* long awaited (space-wizards#9869)

* Add files via upload (space-wizards#9893)

* Automatic changelog update

* Gas pipes now need to be unanchored before deconstruction. (space-wizards#9904)

Cleans up their graphs, they had no spacing at all.

* Automatic changelog update

* Update uplink_catalog.yml (space-wizards#9917)

* Automatic changelog update

* Allow pAIs to play MIDI again (space-wizards#9921)

* Automatic changelog update

* Renamed the Bojevic bundle (space-wizards#9895)

* Small fix

* shuttle winder fix

* Automatic changelog update

* Fix PDA ID light (space-wizards#9938)

* Fix weightless (space-wizards#9939)

* Update ZombifyOnDeathSystem.cs (space-wizards#9919)

* Automatic changelog update

* Remove CanBeAntag for nukeops (space-wizards#9947)

* Automatic changelog update

* Add cvardef template for Rider (space-wizards#9948)

* Research Servers now have proper IDs, and can be selected in lathe menu (space-wizards#9949)

* rd servers now increment properly when added

* remove debug message

* Automatic changelog update

* Adds even more smites and a bunch of tools. (space-wizards#9825)

* Adds three new smites, headstand, locker stuff, and reptilian species swap.

* Localize all the smites.

* save work

* More smites...

* Final tweaks.

* oops

* !PLEH

* Adds disarm prone and improved hand removal options.

* fix chances.

* take out the trash.

* Add some admin TRICKS instead of more smites.

* oop

* Implements the admin test arena and associated trick.

* Tricks for granting/revoking access.

* e

* mfw

* Implement quick dialogs, for when you don't want to spend 20 minutes writing a simple dialog prompt.

* Forgot the rejuv icon.

* E

* docs

* augh

* Add rename/redescribe buttons.

* Adds objects menu, implements a couple tricks for stations.

* 1984

* Adds a trick for effectively infinite power.

* fixes some icon uggo.

* a

* HALT!

* Pause/unpause buttons.

* Forgor the textures.

* they broke every bone in their body.

* i added more

* more battery actions, touch up battery icon.

* Address reviews.

* Automatic changelog update

* i forgor (space-wizards#9951)

* Ban single-line if statements. (space-wizards#9953)

* Ban single-line if statements.

* Make these files more accessible from sln

* Compat for Result Analyzer engine PR (space-wizards#9966)

* Fix pulling cancelling randomly. (space-wizards#9982)

* Fix thrusters using generic Burn damage group instead of Heat type (space-wizards#9972)

Getting high temperature, electric and frostbite burns at once is silly.

* Automatic changelog update

* Various localization fixes (space-wizards#9860)

* Bagel Update 14.5 (space-wizards#9988)

* Marathon Update 2.7 (space-wizards#9989)

* Saltern Update 4.1 (space-wizards#9990)

* Packed Drink 1984 (space-wizards#9991)

* Centered shot glass sprite (space-wizards#9986)

* Automatic changelog update

* Adds the station name to PDAs (space-wizards#9987)

Co-authored-by: ike709 <[email protected]>

* Automatic changelog update

* change shotgun shell boxes from 6 to 12 (space-wizards#9540)

* Automatic changelog update

* Shuttle Window fix thingy (space-wizards#9932)

* guns (space-wizards#9958)

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

* Juggernaut Suit Buff (space-wizards#9994)

* lmao

* Update hardsuits.yml

* thresholds (space-wizards#9960)

* Automatic changelog update

* set canCrush and collision check to false (space-wizards#9957)

* Automatic changelog update

* Prevent Glass duplication in lathes (space-wizards#9954)

* lathes have been handled ;)

* Update LatheSystem.cs

* Automatic changelog update

* Magboot & Stun visualizers (space-wizards#9961)

* Allow changing instrument style while playing them (space-wizards#9946)

* Properly dirty changes when calling "SetInstrumentProgram" method

* Allow using swappable instrument verbs even while playing the instrument.
It's funnier this way

* Automatic changelog update

* Construction graph node test (space-wizards#9995)

* Construction graph node test

* fix the test

Co-authored-by: wrexbe <[email protected]>

* added backpacks to the clothesmate (space-wizards#10006)

* Automatic changelog update

* Update altar.yml (space-wizards#10004)

* Automatic changelog update

* Gas tile overlay rejig (space-wizards#9619)

* Fix a bunch of mover bugs (space-wizards#9999)

* Fix a bunch of mover bugs

Just regressions from random things

* Fix vehicle movement I guess

* Gas tank internals alerts (space-wizards#9567)

* Automatic changelog update

* Fixes power wire action electrocution (space-wizards#8520)

* Don't let someone block if they're too close or if they're in a doorway. (space-wizards#9890)

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* ECS NPCs (space-wizards#9941)

* ECS

* A

* parity

* Remove dummy update

* abs

* thanks rider

* Per-map parallax support (space-wizards#9786)

* Per-map parallax support

* Comments for future sloth

* c

* bet

* Fix exception

* VV support

* Fix parallax

* mem

* weightless sounds

* Gravity stuff

* placeholder coz im too lazy to stash don't @ me son

* decent clouds

* sky

* Fast parallax

* Imagine spelling

* Loicense

* perish

* Fix weightless status

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Scrolling menu parallax + less tiling (space-wizards#9764)

* Scrolling parallax

* unnecessary field

* Load fastspace

* Update submodule to 0.30.0.0 (space-wizards#10012)

* Clip radar control (space-wizards#10011)

Forgor to do it. Still need to make the viewport square but at least it won't draw under the display anymore.

* Revert parallax (space-wizards#10014)

Woops, was using these values for testing scrolling parallax.

* Adds axolotl and snake hood frills for reptilians! (space-wizards#10013)

* Automatic changelog update

* Fix gravity mispredict (space-wizards#10017)

* Automatic changelog update

* Fix magboots in space (space-wizards#10019)

* Automatic changelog update

* Fix cursor popups (space-wizards#10016)

* Automatic changelog update

* Update submodule to 0.30.0.1 (space-wizards#10021)

* fix tests

* I swear if this works...

* Engine update?

* Robust update again

* Updaterino?

Co-authored-by: PJBot <[email protected]>
Co-authored-by: Nemanja <[email protected]>
Co-authored-by: Kara <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Emisse <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
Co-authored-by: Deahaka <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: sBasalto <[email protected]>
Co-authored-by: TaralGit <[email protected]>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: themias <[email protected]>
Co-authored-by: Jacob Tong <[email protected]>
Co-authored-by: Myctai <[email protected]>
Co-authored-by: Level10Cybermancer <[email protected]>
Co-authored-by: Kevin Zheng <[email protected]>
Co-authored-by: ZeroDayDaemon <[email protected]>
Co-authored-by: Morber <[email protected]>
Co-authored-by: Kimpes <[email protected]>
Co-authored-by: TimrodDX <[email protected]>
Co-authored-by: Vera Aguilera Puerto <[email protected]>
Co-authored-by: sunbear-dev <[email protected]>
Co-authored-by: tijn <[email protected]>
Co-authored-by: 13spacemen <[email protected]>
Co-authored-by: Moony <[email protected]>
Co-authored-by: Fooberticus Bazly <[email protected]>
Co-authored-by: fooberticus <[email protected]>
Co-authored-by: Andreas Kämper <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: drakewill-CRL <[email protected]>
Co-authored-by: drakewill <drake@drakewill-crl>
Co-authored-by: OldDanceJacket <[email protected]>
Co-authored-by: Andreas Kämper <[email protected]>
Co-authored-by: Ablankmann <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Chris <[email protected]>
Co-authored-by: Rinkashikachi <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: Flipp Syder <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: T-Stalker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth metalgearsloth left review comments

@gradientvera gradientvera Awaiting requested review from gradientvera

@moonheart08 moonheart08 Awaiting requested review from moonheart08

@mirrorcult mirrorcult Awaiting requested review from mirrorcult

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

@wrexbe wrexbe Awaiting requested review from wrexbe

Assignees
No one assigned
Labels
Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Needs Review Status: Requires additional reviews before being fully accepted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Elijahrane @Emisse @wrexbe @metalgearsloth