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

Added medical scanner #338

Merged
merged 2 commits into from
Sep 18, 2019
Merged

Added medical scanner #338

merged 2 commits into from
Sep 18, 2019

Conversation

DamianX
Copy link
Contributor

@DamianX DamianX commented Sep 10, 2019 •
edited
Loading

Requires space-wizards/RobustToolbox#865

You can enter and eject with a verb. The UI tells you how much of each kind of damage the body has.
Some of the sprites are not in use at the moment, other than in this demo here:

https://streamable.com/4pzmy

Robust Client_wG6yrUw6X1

image

Robust Client_80J8bWrBFg

@PJB3005 PJB3005 added the T: New Feature Type: New feature or content, or extending existing content label Sep 13, 2019
@PJB3005 PJB3005 merged commit 364279e into space-wizards:master Sep 18, 2019
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 1, 2022
@Pspritechologist
Atlas update (space-wizards#338)
ffd3495 
* Updating a more modern Atlas to Nyanotrasen

* Fixes

* Updates and fixes

* Fixes

* Fixes

* Fixes

* Fixes

* added Mail carrier spawn
added missing Epi fab
added sinks to bar
various fixes

* Fixed decals, various additions

* Added dorms to Atlas
Edited entirety of Saltern Epi, fixed atmos
fixed various errors in both

* Fixed Saltern prototype

* Changed min/max value on Atlas/Saltern

* Removed Saltern edits, fixed spawn on Atlas

* Added Atlas cloning update
Morb0 pushed a commit to Morb0/space-station-14 that referenced this pull request Oct 30, 2022
@lapatison
Update drink-component.ftl (space-wizards#338)
2968e53
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 2, 2023
@dvir001
Update bluespace-cargo.ftl (space-wizards#338)
00efd8b
deltanedas pushed a commit to deltanedas/space-station-14 that referenced this pull request Sep 21, 2024
@ps3moira
Merge pull request space-wizards#338 from greystation14/replace-snake…
0348085 
…s-with-pibbles

Infestation Event Creature Changes
Ilya246 pushed a commit to Ilya246/space-station-14 that referenced this pull request Oct 10, 2024
@Aidenkrz @Tayrtahn
@PJBot @Dutch-VanDerLinde @TheShuEd @DrSmugleaf @metalgearsloth @lzk228 @Errant-4 @ElectroJr @IProduceWidgets @osjarw @VasilisThePikachu @deltanedas @Sarahon @EmoGarbage404 @Flareguy @UbaserB @beck-thompson @HolySSSS @Plykiya @Chief-Engineer @Truoizys @JustArt1m @TsjipTsjip @PJB3005 @arimah
Merge Upstream. (space-wizards#338)
0421661 
* Fix double label on chem jugs (space-wizards#29137)

* Automatic changelog update

* Fix DresserFilled storagefill rarely causing an error (space-wizards#29135)

Add ClothingUniformJumpskirtColorPink to an OrGroup

* Fix female reptilians not having gasp sounds (space-wizards#29143)

inital

* clean up weather systems (space-wizards#28792)

* clean up weather systems

* Update WeatherComponent.cs

* Update SharedWeatherSystem.cs

* some fix

* Update SharedWeatherSystem.cs

* Update WeatherComponent.cs

* Update WeatherComponent.cs

* revert autoPause

* Update SharedWeatherSystem.cs

* Implement vital chef's hat functionality (space-wizards#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist

* Automatic changelog update

* Add cvar to disable round end pvs overrides (space-wizards#29151)

* Update submodule to 226.1.0 (space-wizards#29159)

* Fix conveyor mispredicts (space-wizards#28157)

* Fix conveyor mispredicts

Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely.

* Fix ActiveConveyor

* Fix lerping

* Automatic changelog update

* Replace StationRandomTransform (space-wizards#29149)

* Revert "Rotate and Offset station CCVar nuke (space-wizards#26175)"

This reverts commit 44b20f6.

# Conflicts:
#	Content.Server/Station/Systems/StationSystem.cs
#	Resources/Prototypes/Maps/europa.yml

* Fix

* Review

* Add warning cones to engivend (space-wizards#29085)

Add cones to engivend

* Automatic changelog update

* arachnid inventory layout fix (space-wizards#29165)

arachnid inventory layout fixC

* Automatic changelog update

* Turn interaction related attempt events into structs (space-wizards#29168)

* Turn InteractionAttemptEvent into a struct event

* readonly

* GettingInteractedWithAttemptEvent

* ConsciousAttemptEvent

* Add the most anticipated gun in the game. Foam Force. (space-wizards#29103)

* Foam Force

* make it available somewhere

* add clumsyproof and nuke dev item

* reorganize

* oopsy files

* Strap!

* woopsie layering

* fix grammar to rerun tests for rogue unrelated test fail.

* cleanup

* I eepy layer forgetti spaghetti

* For real last necessary commit

* Oops I broke the law! feexed

* Decided to just change it to the same source as the poster source in our repo for consistency.

* Automatic changelog update

* Fix material storage going BRRT (space-wizards#29167)

If the volume hits 0 we just remove it.

* Automatic changelog update

* Fix air alarms (space-wizards#29172)

Broken by space-wizards#28272

* Automatic changelog update

* Hidden loadout groups (space-wizards#29170)

* loadout hiding

* department of redundancy department

* Upgrade rsi-diff's changed files action | Make it only return rsi and png changes (space-wizards#29185)

It was brought up to me in space-wizards#29179 (comment) (and from a dm from them) that space bars can cause issues with the rsi bot.

Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream)

* unhardcode thief MaxSelectedSets (space-wizards#29175)

* unhardcode thief MaxSelectedSets

* we do a little copy paste :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* PullingController cooldown change (space-wizards#29177)

* Revert "Automatic changelog update"

This reverts commit 3358aef.

* Revert "Revert "Automatic changelog update""

This reverts commit 3d0b6a7.

* Removal of the throw cooldown as it felt sluggish and unresponsive before.

* Decrease meteor frequency (space-wizards#29194)

* Automatic changelog update

* Security Resprite (space-wizards#29082)

* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update

* Automatic changelog update

* Make Hamlet a valid chef's hat pilot (space-wizards#29191)

* Fix Underwing wings (space-wizards#29092)

* add

* tweak thickness of stripe

* Add some happier medibot messages! (space-wizards#29147)

* Happy!

* opps

* one more

* Automatic changelog update

* shorten short raffle (space-wizards#28685)

* Automatic changelog update

* Fix some lathe recipe textures showing up blank (space-wizards#28683)

* Update lathes to use entity prototype

* ScrollContainer my hero

* gets rid of excess newlines

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Grammar fix to medibot! (space-wizards#29197)

fixed

* Restore default panic bunker and tweak baby jail (space-wizards#29198)

restore default panic bunker

* Fixed cartridges installing more than once (space-wizards#29187)

* fixed cartridges installing more than once

* replaced prototypes with CartridgeComponent

* relocated checks from InstallProgram to InstallCartridge

* Automatic changelog update

* Musician's skirt (space-wizards#29203)

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>

* Automatic changelog update

* hos cap resprite (space-wizards#29208)

* hos cap resprite

* 1. 2. 3 4 Oh

* Automatic changelog update

* Rejig device link sink & source startup & shutdown (space-wizards#29035)

* Fix DeviceLinkSinkComponent not updating sources on shutdown

* Log error

* Misc link changes & fixes

* Fix core

* Add prediction for Tech Disks, cleanup (space-wizards#29061)

* Add prediction for Tech Disks, cleanup

* Remove IsServer check in OnMapInit

* Use HashSet for techs, remove LINQ

* Code cleanup: radio jammer (space-wizards#29052)

* Code cleanup for radio jammer

* More Entity<T> for the people, and fix an accidental variable reuse

* Partial buckling refactor (space-wizards#29031)

* partial buckling refactor

* git mv test

* change test namespace

* git mv test

* Update test namespace

* Add pulling test

* Network BuckleTime

* Add two more tests

* smelly

* Fix documentation typo (space-wizards#29209)

Fix everything.

* Emergency toolbox fill rework (space-wizards#29202)

* emergency toolbox fill rework

* Fuck

* Add wet floor sign & warning cone to autolathe (space-wizards#29205)

* Add wet floor sign & warning cone to autolathe

* removing

* Automatic changelog update

* Tools batch files (space-wizards#29179)

* Tools batch files

* fine

* Fix terrible portable scrubber unlit layers (space-wizards#29232)

Jesus fucking christ man

* Prevent fly-by fixture from powering containment field generator (space-wizards#29225)

* Prevent fly-by fixture from powering containment field generator

* Update according to review

* Automatic changelog update

* Hide moth antenna and lizard frills with hardsuit helmets, fix lizard snouts not being hidden (space-wizards#29214)

* inital

* Update ClothingSystem.cs

* Update helmets.yml

* Automatic changelog update

* Fix and enable TestEmptyLoadout (space-wizards#29228)

* Fix and enabled TestEmptyLoadout

* Fine, have a real name

* Fix brokey code :)

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: Truoizys <153248924+Truoizys@users.noreply.github.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 11, 2024
@BlueHNT
Collection of Fixes and QOL Features (space-wizards#341)
197c1a4 
* fixes Issue: Heavy weapon back sprites are broken space-wizards#338

* fixes Issue: Heavy weapon back sprites are broken space-wizards#338

* nerfs BrushGun fireRate to 2

* lowers hunting rifle fireRate to 1.5, increases varmint fireRate to 2.2

* fixes weird indent

* rebalances power armors based on lore and testing

* fixes low heat resistances (laser) and makes ranger suits pocketed

* Adds NCR encryption and grants it to high ranking NCR

* adds N14 door access to AA assumed merge after PR space-wizards#337

* Adds NCR radio, Adds Encryptions to default tcomms (filled)

* fixes `crypt_white` to `crypt_grey`

* `grey` to `gray`
SlamBamActionman pushed a commit to SlamBamActionman/space-station-14 that referenced this pull request Nov 1, 2024
@dffdff2423 @SlamBamActionman
Make character name reset upon resetting records. (space-wizards#338)
c8a32fe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PJB3005 PJB3005 Awaiting requested review from PJB3005

@ZoldorfTheWizard ZoldorfTheWizard Awaiting requested review from ZoldorfTheWizard

Assignees
No one assigned
Labels
T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DamianX @PJB3005