Commit Graph

1354 Commits

Author SHA1 Message Date
ShadowCommander
5ba86d16f8 Organize gas canister prototype 2021-08-10 17:38:50 -07:00
ShadowCommander
26ebcb4cb8 Fix gas canister 2021-08-10 16:55:12 -07:00
ShadowCommander
730c137778 Merge branch 'master' of github.com:space-wizards/space-station-14 into replace-sounds-with-sound-specifier 2021-08-10 15:17:58 -07:00
ShadowCommander
a1db43ab34 Merge branch 'master' into replace-sounds-with-sound-specifier 2021-08-10 15:05:49 -07:00
Swept
b16a044a2b Added restrictions for what can be inserted into most belts (#4367)
* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo
2021-08-10 13:36:00 -07:00
SethLafuente
04bbaa820f Made the cloning pod and medical scanner constructible (#4439)
* Made the cloning machine pod constructable

* Added everything like I did but with the Medical Scanner

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-08-08 20:21:18 +00:00
TimrodDX
8505d307a7 Adds windoors for security and the brig. (#4441) 2021-08-07 14:29:47 -07:00
SethLafuente
9c18331d96 Gave CMO a Hardsuit (#4434)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-08-06 23:11:18 +00:00
SethLafuente
96c49a151c Adds Science Windoors (#4433)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-08-06 22:46:51 +00:00
Vera Aguilera Puerto
41ddf3d7eb Further pickup animation improvements. 2021-08-06 19:20:27 +02:00
ShadowCommander
a274b3a399 Merge pull request #4368 from mirrorcult/2021-07-16/windoors
Windoors
2021-08-05 23:09:38 -07:00
Kara D
fcc7d029b9 leftover 2021-08-05 22:08:16 -07:00
Kara D
9354abb024 reviews + test 2021-08-05 22:01:02 -07:00
Kara D
5af4c06231 construction 2021-08-05 21:10:06 -07:00
Swept
3f13323675 Removes broken new-line markers from a few desc. 2021-08-05 20:28:54 -07:00
Kara D
e460285187 proper sprites + visualizes nicely 2021-08-05 19:43:58 -07:00
Kara D
8dbd17045b Merge branch 'master' into 2021-07-16/windoors
# Conflicts:
#	Content.Server/Doors/Components/AirlockComponent.cs
2021-08-05 17:36:13 -07:00
Kara D
fc23701fc0 a 2021-08-05 17:35:14 -07:00
SethLafuente
96354923ab Added two new small areas to maintenence (#4359)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-08-05 22:20:58 +00:00
Swept
532c9a6431 Adds an alternate jumpsuit for botany (#4419)
* Adds an alternate botanists jumpsuit

* Updated license information
2021-08-05 20:18:05 +10:00
ScalyChimp
bf43141c96 Meth (#4186)
* adds an overdose metabolism with sensible default settings

* adds the compoenents for the run fast part of meth

* not sure what I changed here but I trust my past self to not fuck up for once

* adds basic meth recipe

* correctly names comething

* I really should've checked my spelling before making this pr

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

* adds suggestion from the maintaner, who managed to get to this pr suprisingly fast

* Revert "adds suggestion from the maintaner, who managed to get to this pr suprisingly fast"

This reverts commit 9b0f07402e35ed5890b3af805691b690671b950c.

* tweak

* tweak

* git's gitting on my nerves

* some small tweaks

* don't need these anymore

* makes some stuff required

* changes the meth recipe to arbitary bullshit to get the yaml thingy to leave me alone goddamnit

* extremely minor change

* removes overdose, because however it's gonna be done, it's definitely not my way

* i should really double check every key I press

* hm

* sigh, I should be more thorough with looking at error messages.

* beenus

* gay sex is gay

* this one goes out to bingo

* reviews

* not sure why status lifetime description wasn't being commited

* Update MovespeedModifierMetabolism.cs

Co-authored-by: mirrorcult <notzombiedude@gmail.com>

* adds VV to component variables

* rebalances meth, and makes the completely unrealistic recipe properly work now

* meth effects should go away now or something do you think I test these changes before pushing??

* ah yes, orginization

* adds proper recipe and prequisite chemicals

* fixes linter hopefully

* Update chemicals.yml

* a

* starts working on prediction

* thing

* predmiction??

* changes thing

* does it properly

* uses timespan instead of timer

* uses dif timers and adds a system

* updates robust and tweaks a small thing

* Fixes

* "Fix" prediction

* starts changing the timer to timespans to avoid icky on timer end

* okay fixes the check thing but now meth is broken and I don't know why

* fixes predicition (partially)

* Delete ContentNetIDs.cs

whoops

* some changes advised by sloth

* certified scalycode fix right here

* moves resettimer to the metabolism to make it less oop stinky

* moves resettimer to the metabolism to make it less oop stinky

* gamin

* when the  is

* updates mth colour to be accurate because I forgot

* abc hard ok

* everything should be up to date now

* makes MovespeedModifierMetabolism ECS and cleans up some other stuff

* does a fixy wixy

* fix thing

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth"

This reverts commit 62886561098be02f9adb6352f4e858a8269d5bd5, reversing
changes made to ca34fffb5b7a40f19aec7b9e4bc37bdeab914bc1.

* Revert "Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth""

This reverts commit 4f550da19656abfd0be05f818fc6b7100252d5b8.

* fix hopefully

* updates metabolism to works with mirror's fancy new system

* updates yaml + tweaks

* bruh

* yaml moment

* :yaml moment

* Revert " :yaml moment"

This reverts commit 8cb51573c64db76d989de22acdbb9c50b2c6d052.

* 99th commit yay, also I need to not do this

* removes something that I don't need

* makes system work with this and gets rid of unnesescary check

* make the update only work on active components

* oops

* Cleanup

* alphabetise this shit

* Touchup

* Woops stupid alloc by me

* Nerf nyoom for now

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: mirrorcult <notzombiedude@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-08-03 13:32:08 +10:00
metalgearsloth
34defef80f Fix gravity generator yeeting 2021-08-02 23:50:48 +10:00
Vera Aguilera Puerto
009087863f AtmosDevices can optionally process in space. (#4405)
Refactors some misc atmos things, too.
2021-08-02 21:59:41 +10:00
mirrorcult
af2e21c355 Refactor IDoorCheck into entity events (#4366)
* IDoorCheck refactored to events

# Conflicts:
#	Content.Server/Atmos/TileAtmosphere.cs
#	Content.Server/Doors/Components/AirlockComponent.cs
#	Content.Server/Doors/Components/FirelockComponent.cs
#	Content.Server/Doors/Components/ServerDoorComponent.cs
#	Content.Server/Doors/IDoorCheck.cs

* namespaces

* Fix mapinit bug with refreshautoclose

* ok i guess these just didnt feel like staging today
2021-08-02 21:57:06 +10:00
Vera Aguilera Puerto
331604cc66 GasFilter appearance, EnabledAtmosDeviceVisualizer improvements. 2021-08-02 13:20:31 +02:00
Swept
ff320b4edc Fixes invalid yaml line (#4408) 2021-08-01 22:13:28 +00:00
SethLafuente
746eba6325 Made plasma grindable (#4334)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-08-01 19:05:02 +00:00
Paul Ritter
d14b82a1e6 fixes morgue (almost) (#4375)
* fixes morgue (almost)

* yes

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
2021-08-01 14:13:46 +10:00
Vera Aguilera Puerto
f2a3987343 Add subfloor appearance data, pipes correctly render subfloor. (#4393) 2021-07-31 19:50:36 -07:00
Galactic Chimp
10baebae79 changed some prototypes' sound paths 2021-07-31 20:00:03 +02:00
Galactic Chimp
b2e40d540f Inserted SoundSpecifier where appropiate 2021-07-31 15:17:16 +02:00
mirrorcult
8aa4f998de Metabolism refactor (#4395)
* metabolism -> respirator, add reageanteffect and reagenteffectcondition, start on metabolizercomp/system

* move LiverBehavior metabolism logic to Metabolizer

* minor tweaks and update all YAML

* how about actually taking conditions into account

* off by one

* removals

* reviews
2021-07-31 13:50:32 +02:00
Galactic Chimp
41c30aa28b Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
#	Content.Server/Hands/Components/HandsComponent.cs
#	Content.Server/Light/Components/ExpendableLightComponent.cs
#	Content.Shared/Light/Component/SharedExpendableLightComponent.cs
2021-07-31 13:16:03 +02:00
Vera Aguilera Puerto
dc18997bf8 Removes LoopingSoundComponent. (#4396)
I'm sorry.
2021-07-31 12:41:59 +02:00
Pieter-Jan Briers
632e72b817 Improve hands & pulling (#4389) 2021-07-31 03:14:00 +02:00
Galactic Chimp
5363f59a90 Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
#	Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
#	Content.Server/Storage/Components/SecureEntityStorageComponent.cs
2021-07-30 20:26:22 +02:00
Galactic Chimp
898bdc9491 #4420 Replaced SecureEntityStorageComp with LockComponent (new ECS) (#4228)
* #4420 moved sound components to a better spot in the project

* MWF-4420 - ported SecureEntityStorageComponent to new ECS system, as a LockComponent

* MWF-4420 - removed unused usings

* #4420 removed dumb ToggleLockVerb override workaround

* #4420 added SoundSpecifier to LockComponent
2021-07-30 10:22:06 -07:00
SethLafuente
b75c072fac adds bio suits into bio lockers (#4377)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-28 17:36:06 +00:00
SethLafuente
283dcb0802 Gives RD locker a hardsuit (#4376)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-26 22:14:10 +00:00
Swept
86aa1caddb Updated bucket's size to 100 2021-07-26 09:49:43 -07:00
Swept
aa4727d185 Gas tanks have proper item sizes 2021-07-26 09:39:12 -07:00
Swept
e826615f81 Updates broken description in sprays.yml 2021-07-26 07:10:00 +00:00
SethLafuente
cad7a9ad54 Gave lab Coats Storage Room (#4370)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-26 05:36:27 +00:00
Kara Dinyes
28f3424680 sound + locked prototypes 2021-07-25 20:36:55 -07:00
Kara Dinyes
c8f79fdcaf windoors work #Dab 2021-07-25 20:21:02 -07:00
Kara Dinyes
ecad9fc32d Merge branch 'master' into 2021-07-16/windoors 2021-07-25 18:25:59 -07:00
mirrorcult
a91f919018 Remove FoodContainer, add whitelists, replace with SpawnItemsOnUse (#4358) 2021-07-25 17:41:50 +02:00
Swept
ae84ba07e6 Add botanical belt to botanist's locker 2021-07-25 15:40:21 +00:00
SethLafuente
e7eb3068a0 Added Makeshift Handcuffs as a craftable item (#4294)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-25 17:30:41 +02:00
Galactic Chimp
f531c65a0b Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
#	Content.Server/Actions/Actions/DisarmAction.cs
#	Content.Server/Actions/Actions/ScreamAction.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
#	Content.Server/Explosion/Components/FlashExplosiveComponent.cs
#	Content.Server/Physics/Controllers/MoverController.cs
#	Content.Server/Portal/Components/PortalComponent.cs
#	Content.Server/Portal/Components/TeleporterComponent.cs
#	Content.Server/Projectiles/Components/ProjectileComponent.cs
#	Content.Server/Singularity/Components/EmitterComponent.cs
#	Content.Server/Sound/EmitSoundSystem.cs
#	Content.Server/Stunnable/Components/StunbatonComponent.cs
#	Content.Server/Tools/Components/MultitoolComponent.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Shared/Gravity/GravityComponent.cs
#	Content.Shared/Light/Component/SharedExpendableLightComponent.cs
#	Content.Shared/Maps/ContentTileDefinition.cs
#	Content.Shared/Slippery/SlipperyComponent.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
2021-07-25 14:12:00 +02:00