Commit Graph

184 Commits

Author SHA1 Message Date
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
TimrodDX
2697ebd81f Fixes the windoor in science. (#4444) 2021-08-09 17:28:11 -07:00
metalgearsloth
66b6c52627 Update maps for grid collisions (#4450) 2021-08-10 00:15:44 +10:00
TimrodDX
19e3c7f339 Remaps Chemistry and Security, and some Mapping Fixes (#4442) 2021-08-08 00:32:18 +00:00
Swept
1c081792e5 Maps in windoors (#4432) 2021-08-07 12:47:42 +10:00
Jaskanbe
a1a338a12b Fixed station engineer table spawn (#4436) 2021-08-06 18:47:11 -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
Galactic Chimp
b2e40d540f Inserted SoundSpecifier where appropiate 2021-07-31 15:17:16 +02:00
Vera Aguilera Puerto
995f1dbf1a Remove archived moles from saltern. 2021-07-26 11:33:06 +02:00
metalgearsloth
500b9cb1ea Make Saltern driveable (#4257)
* Broadphase refactor (content)

* Shuttle jank

* Fixes

* Testing jank

* Features and things

* Balance stuffsies

* AHHHHHHHHHHHHHHHH

* Mass and stuff working

* Fix drops

* Another balance pass

* Balance AGEN

* Add in stuff for rotating shuttles for debugging

* Nothing to see here

* Testbed stuffsies

* Fix some tests

* Fixen test

* Try fixing map

* Shuttle movement balance pass

* lasaggne

* Basic Helmsman console working

* Slight docking cleanup

* Helmsman requires power

* Basic shuttle test

* Stuff

* Fix computations

* Add shuttle console to saltern

* Rename helmsman to shuttleconsole

* Final stretch

* More tweaks

* Fix piloting prediction for now.
2021-07-21 21:15:12 +10:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
metalgearsloth
e726e88f7a Remove PhysShapeGrid (#4264) 2021-07-14 18:48:07 +10:00
SweptWasTaken
29b734a35a Fixed unpowered part of the station caused by pow3r 2021-07-08 23:43:00 -07:00
Pieter-Jan Briers
103bc19508 Pow3r: stage 1 (#4208)
Co-authored-by: 20kdc <asdd2808@gmail.com>
2021-07-04 18:11:52 +02:00
metalgearsloth
d1b0d5aa58 Fix trash being spawned on substation (#4254)
* Fix trash being spawned on substation

Waste of an awake body

* Also get this garbage
2021-07-04 22:31:46 +10:00
DmitriyRubetskoy
427ed72754 Changed airlock type from service to theatre (#4246) 2021-07-01 21:07:18 +10:00
mirrorcult
2333950bdc Lighting tweaks (#4171)
* lightning

* softness

* a little less orange
2021-06-16 15:55:55 -07:00
mirrorcult
1c7285825c Refactor ExtinguisherCabinet->ItemCabinet and actually maps them in, adds EntityWhitelist (#4154)
* i probably shouldnt have done this in one commit

* map nonsense

* fix example code

* unnecessary

* test

* reviews

* little fix for open datafield

* add soul
2021-06-09 12:10:29 +10:00
TimrodDX
74765700b8 Chemistry Mapping Revamp (#4149) 2021-06-07 01:35:24 +00:00
20kdc
a3d9562532 Makes the singularity engine actually work stably. (#4068)
* Add GNU Octave script for tuning singularity engine. startsingularityengine is now properly tuned & sets up radiation collectors. FTLize RadiationCollectorComponent.

* Fix bugs with radiation collectors producing infinite power.

* Ensure singularities don't instantly annihilate other singularities (causing new singularities to instantly dissolve)

Technically found by a "bug" where a singularity generator would make multiple singularities, but this renders that bug harmless.

* Tune singularity shield emitters to hopefully randomly fail less, and add an Octave script for looking into that

* Fix singularity shader

* Map in an unfinished PA into Saltern

* Correct PA particles being counted twice by singularity calculations, add singulo food component

* Hopefully stop "level 1 singulo stuck in a corner" issues by freezing it when it goes to level 1 from any other level

* Apply suggestions on 'jazz' PR
2021-05-28 11:44:13 +02:00
TimrodDX
c69ab61153 Hotfixes the Boda Machine (#4012)
* Hotfixes Boda machine. Doesn't fix underlying rotation issue.

* Fixes some metadata lines that were changed somehow.
Please let me know if there are any other issues.
2021-05-17 00:39:37 -07:00
BulletGrade
30814898a8 Add crates of materials to R&D (#4007) 2021-05-15 17:45:32 +00: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
ShadowCommander
ac98260682 Fix breathing test map 2021-05-02 15:23:46 -07:00
Swept
682b36ae23 Wall YAML cleanup (#3864)
* Code Quality

* IDs and mapping

* Construction Recipes
2021-04-16 06:47:18 +00:00
SweptWasTaken
930e1e2acb Wiring near HoP office - Thanks Timrod! 2021-04-15 22:43:42 -07:00
BulletGrade
eb9f2117c2 Add small lamp into service maintenance (#3849) 2021-04-15 20:02:22 +00:00
BulletGrade
17739f4fdf Add BarDrobe and Bar Backroom into Saltern (#3843)
* Add BarDrobe

* Add Tophat and beer goggles into BarDrobe

* Add bar backroom

* Fix license

* Fix roundstart atmos

* Refactoring and using specific commit for meta.json

* Add black shoes into BarDrobe

* Update meta.json to standard

Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-15 18:24:55 +00:00
ike709
f0fc33a01a Adds a library to the saltern (#3831)
Co-authored-by: ike709 <sparebytes@protonmail.com>
2021-04-13 00:32:20 +00:00
Swept
21bea1c8a8 Remaps computers again (#3806)
* Initial

* Rest of the things
2021-04-04 14:44:55 -07:00
Swept
3b507e1dfd Replaces all computers on Saltern and reinforces all space-touching walls (#3773) 2021-04-02 21:37:33 +02:00
Swept
021545ebbc Remaps all potted plants and gas canisters and replaces tool storage airlock with unlocked glass (#3744) 2021-03-29 23:50:33 +02:00
Swept
3724ec45b3 Remaps gas canisters and window signs (#3738) 2021-03-28 19:36:40 +11:00
Swept
29d02a3740 Attempts to fix all physics bugs at once (#3610)
* Fixed Rack/Shelf

* Fixes bookshelf, bed

* Placeable for beds for bedsheets

* Bunch of Physics changes, ask metalgearsloth about em'

* More modifications

* More

* Other stuff

* Organizes entities yaml a little bit

* Something new

* Fixed, happy with the state of this rn

* A

* A

* Ye

* E

* Done for now...

* Applied Reviws

* Changes

* Fix the robust commit

* Fixes tests?

* E

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-03-26 12:51:26 +11:00
Vera Aguilera Puerto
848eaa9224 A few saltern fixes and tweaks.
- Fixes computers and machines having weird things inside them. Like the ID computer in captain's headquarters, which had a glass firelock inside it. Or the ID computer in HOP's office, which had an APC wire inside it. Sigh.
- Arcade board in maint.
- Slime plushie in maint.
- Atmos and engineering now have canisters.
- Added plasteel to engineering.
- Replaced a few empty crates in engineering for material crates.
- Uncursed the cursed locker.
- probably more, I forgot already.
2021-03-25 02:02:40 +01:00
ShadowCommander
4efa9afa85 Add table deconstruction and fix table destructible spawns (#3705)
* Add table deconstruction and fix table destructible spawns

* Change table names to match and add construction recipes

* Fix reinforced table and table frame destruction not dropping metal rods
2021-03-24 15:34:07 -07:00
Swept
f47984d053 Change tables in cargo from MetalTable to Table (#3688) 2021-03-16 20:42:27 -07:00
Swept
fabc97d733 Fixes SMG mag issues (#3683)
* SMG crate correct mags

* Map Hotfixing
2021-03-16 09:14:11 +01:00
Swept
9cf8768754 Saltern mapping updates (#3669) 2021-03-16 16:46:31 +11:00
mirrorcult
e81db48cd1 Fix various issues with the emitter (#3329)
Co-authored-by: cyclowns <cyclowns@protonmail.ch>
2021-03-14 23:02:22 +01:00
Swept
9a604e38d6 Updates chemistry layout on Saltern (#3658)
* Adds content

* Maps

* Fixed
2021-03-14 16:24:22 +11:00
Vera Aguilera Puerto
ab4b275247 Revert "Changes chemistry to be more secure for now (#3649)" (#3651)
This reverts commit fc9a62581b.
2021-03-13 13:54:48 +01:00
Swept
fc9a62581b Changes chemistry to be more secure for now (#3649)
* Adds content

* Maps
2021-03-13 20:27:53 +11:00
Swept
bf99a91507 Revert "Revert "Slight changes to spawners"" (#3627)
* Revert "Revert "Slight changes to spawners (#3605)" (#3624)"

This reverts commit 8c01d9d9dc.

* Bring back clicktest.yml

* Update IgnoredComponents.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-03-12 21:28:40 +01:00
metalgearsloth
8c01d9d9dc Revert "Slight changes to spawners (#3605)" (#3624)
This reverts commit a47e1b817c.
2021-03-12 20:22:33 +11:00
Swept
a47e1b817c Slight changes to spawners (#3605)
* Initial

* Done

* Ye

* Removes mouse spawns for now

* I'm an idiot!
2021-03-12 19:43:55 +11:00
Swept
87aced8392 Adds mice (#3594)
* Initial

* Mmm

* Adds them to map

* Makes mice grindable

* meta.json looking nice

* Mice go squeak

* Ye

* E

* Review

* Update Content.Server/GameObjects/Components/Mobs/Speech/MouseAccentComponent.cs

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-03-11 01:06:57 +01:00
Elijahrane
851f5925a5 Replace locked Tool Storage service doors with unlocked engineering doors (#3582)
* Replaced tool storage airlocks with unlocked ones

* Changed the service sprite for an unlocked engineering door which seems more fitting
2021-03-09 10:41:13 +01:00
Swept
033f222908 Fixes people being spawned in walls on Saltern (#3585) 2021-03-08 20:17:06 +01:00