tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,814 Commits 3 Branches 5 Tags
eeefbcb513314fa1715c84f2dc726d0b32b9a63c
Commit Graph

10814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OldDanceJacket
bbf5976f00 Pillar update (#9126) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-28 23:44:40 +10:00
metalgearsloth
5885e108ae Fix master merge (#9254) 2022-06-28 23:39:48 +10:00
Peptide90
20e27e2c7d Salvage Locker Balance / Changes (#8839) 
* added items and added probability to more items

* increased pickaxe probability. Made Spatio suit guaranteed

* removed pickaxe and ore bag

* removed laser gun. rip
 2022-06-28 23:21:46 +10:00
metalgearsloth
cef3b8b7e4 Update submodule (#9252) 2022-06-28 22:57:22 +10:00
Leon Friedrich
c13c0b8b0b Remove implicit GridId conversions (#8975) 2022-06-28 22:56:02 +10:00
Morber
7a14c6f331 Localize jobs (#8968) 
* Localize job supervisors

* Rename supervisors file

* Localize job names

* Remove localization for fallback job name

* Use LocalizedName for Job

* Fix job names case
 2022-06-28 22:55:05 +10:00
metalgearsloth
5dbb3220dd ECS and bandaid research (#9251) 2022-06-28 22:54:08 +10:00
Peptide90
9b08457e52 dart ert fix (#8958) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-28 21:14:31 +10:00
metalgearsloth
f0cc636c1d Add door prying to xenos (#8917) 
* Add door prying to xenos

* a

* c
 2022-06-28 20:50:58 +10:00
EmoGarbage404
ef3a02397a Potted Plants Cleanup (#9196) 
* pray for me

* yippee

* collision fix
 2022-06-28 20:49:26 +10:00
Pieter-Jan Briers
97c74d5903 Completions for fixgridatmos (#8983) 
* Completions for fixgridatmos

* Fix stuff

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-28 19:08:29 +10:00
metalgearsloth
4eccdc73ee Bandaid awakebodies for tilefriction (#9249) 2022-06-28 14:43:00 +10:00
metalgearsloth
34f969ea9f Update submodule (#9248) 2022-06-28 13:13:50 +10:00
OldDanceJacket
65edf3680b Add files via upload (#9202) 2022-06-27 20:20:33 -05:00
ike709
d770eb6a35 Forensics (#8451) 
* Port forensics from nyanotrasen

* port updates

* printing

* Update Resources/Locale/en-US/forensics/forensics.ftl

Co-authored-by: Veritius <veritiusgaming@gmail.com>

* Update Content.Server/Forensics/Components/ForensicPadComponent.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicPadSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicScannerSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* partially address reviews

* comments

* redo the events

* handle it

* rewrite loc

* master fixes

Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-06-27 20:04:53 -05:00
TaralGit
8b0e8915a8 Hand made pistol replacement and inhands for ak and china lake (#9198) 
* hand made pistol replacement and inhands for ak and china lake

* china lake inhands correction

* change

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-27 19:18:01 -05:00
EmoGarbage404
d3f44b8d5a Make Inflatable doors transparent (#9243) 
* Update inflatable_wall.yml

* Update inflatable_wall.yml
 2022-06-27 19:15:47 -05:00
keronshb
206513c31b Thieving component and Thieving Gloves (#9158) 
* Thieving component and gloves

* Fixes popup issue

* Forgot to add it for hands

* Adds a bool datafield

* Comments

* Requested changes
 2022-06-27 19:14:51 -05:00
Ablankmann
1af61c5041 Syndicate Shoulder Holster and the Outlaw's Hat (#9147) 
* Syndie Holster sprite

* Outlaw Hat sprite

* Outlaw Hat entity

* Syndie Shoulder Holster entity

* Tweaked sussy toolbox

* Tweaked Syndie Holster

* Outlaw Hat and Syndie Holster to the Uplink

* it was a misinput, calm down

* Tweaked holster so it can only hold weapons

* and ammo too

* fixing conflicts... from my OWN PR....

* Fixed another conlfict

* fix
 2022-06-27 16:25:22 -07:00
Moony
764503bb81 webedit so that people can execute the RemoteExecCommand. (#9242) 2022-06-28 01:09:11 +02:00
Júlio César Ueti
bda1999675 Adjust alert level volumes (#9145) 
* Finally

* Requested adjustments
 2022-06-27 13:45:01 -07:00
Rane
21b07b7b26 Remove plants with no utility from common sources (#9235) 
* Remove plants with no utility from common sources

* review
 2022-06-27 11:12:03 -07:00
wrexbe
c97243413b Make centcomm unvotable (#9239) 2022-06-27 10:38:41 -07:00
KIBORG04
a62486d38d Puddle slippery again! (#8899) 
* f

* blood

* Revert "f"

This reverts commit 7a8375120699142a5c6202c80e5fd0e193575d16.

* Revert "blood"

This reverts commit d6510f4c3b8f80992900c6e1d9218b88b146529f.

* normal fix
 2022-06-27 10:30:06 -07:00
Rane
3ff3d21ff1 Add mintemp to meth reaction (#9234) 2022-06-27 10:22:55 -07:00
EmoGarbage404
71e61dcf22 Give lawyer sec headset (#9205) 2022-06-27 09:43:16 -07:00
EmoGarbage404
659b60adce Crates can go under plastic flaps (#9236) 
needed to be SmallMobMask in order to fit under doors
 2022-06-27 09:36:38 -07:00
lapatison
59d6d683a2 SMG crate magazines fix for Wt550 (#9237) 2022-06-27 09:34:24 -07:00
metalgearsloth
1633d7fbb5 Bump cuff times (#9227) 2022-06-27 09:28:04 -07:00
Emisse
b7f8a688dd Lighthouse and Waystation posters (#9141) 2022-06-28 01:04:55 +10:00
EmoGarbage404
7e2110b274 Place tanks in cargo shuttle (#9233) 
they didn't need to be in crates.
 2022-06-28 00:44:02 +10:00
LittleBuilderJane
6325a10a43 Adds the Central Command outpost for Roundend and ERT to spawn at. (#9146) 
* Adds Reach II

* Updated Reach II to work after refactor

* removing old map

* Adding the Central Command outpost

* Reachii isn't meant to be in here at all.

* updated possible error in .yml

* updating .yml

* Updated CentComm, fixed some issues like lighting.

* Imagine if we also docked at centcomm

* a

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 23:11:39 +10:00
EmoGarbage404
5e316afe86 Update traitorObjectives..yml (#9231) 2022-06-27 13:37:41 +02:00
Leon Friedrich
6b4c2e9b40 Add more instrument interaction checks (#9223) 2022-06-27 18:09:21 +10:00
metalgearsloth
c3a208234a Stun baton tweaks (#9225) 
* Stun baton tweaks

* a

* sprotes
 2022-06-27 17:51:38 +10:00
Leon Friedrich
86f70994bf Network item slots (#9199) 2022-06-27 16:29:14 +10:00
Peptide90
c33508b7e1 Adds TileNotBlocked to atmos stuff (#8959) 2022-06-27 15:42:27 +10:00
OldDanceJacket
b88df5fa4d Add files via upload (#9201) 2022-06-27 15:39:00 +10:00
Júlio César Ueti
a265cd8935 Hotfix for Body Bags (#9155) 
* Oops

* Requested changes

* Renamed

* rename

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 15:37:29 +10:00
metalgearsloth
e9d6156d0c Fix the singularity (#8890) 
* Revert "Fixes the singularity bouncing off the station. (#8452)"

This reverts commit dc186f1e24.

* Fix singulo
 2022-06-27 15:22:44 +10:00
metalgearsloth
12e5cdacae Disable emergency shuttles locally (#9195) 
Can still re-enable via cvar but this is to make devving faster.
 2022-06-27 15:19:40 +10:00
metalgearsloth
8a6d914586 Drop hyperspace speed (#9216) 2022-06-27 14:58:58 +10:00
metalgearsloth
e72e060972 Don't load cargo shuttle by default (#9194) 
* Don't load cargo shuttle by default

Realistically only I am going to care and it wastes a few seconds per test / debugging locally.

* Make it a general cvar instead

* a
 2022-06-27 14:58:40 +10:00
Júlio César Ueti
2ae4e80732 Fixes jetpacks not shutting off on lack of fuel (#9206) 
* Push

* tolerance and reduced moles

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 14:36:20 +10:00
Profane McBane
a73a6042d7 Trashbag Alt Verb to dump into disposals + Cigars are tagged as trash (#9203) 
* cigars are marked as trash

* alt click added to trashbag disposals interaction

* request changes

* remove redundant check and auto refactor

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 14:19:18 +10:00
Morber
c0216e5caf Add missing channels for mining & robotics headsets (#9188) 2022-06-27 14:14:48 +10:00
metalgearsloth
375a53ce60 Fix sloweddown stopping its own shutdown refresh (#9214) 2022-06-27 14:08:18 +10:00
Rane
8b699052d2 Remove starvation damage (#9024) 
* Remove starvation damage

* remove more

* Even more cleanup
 2022-06-27 14:08:08 +10:00
Jessica M
8ba1c1f5e9 Remove more interaction without hands (#8946) 
* Remove stack splitting without hands

* more no hands crap
 2022-06-27 14:07:07 +10:00
EmoGarbage404
5f4d50304f Update uplink_catalog.yml (#9192) 2022-06-27 14:05:11 +10:00