NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 03:11:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
10992 commits 14 branches 0 tags 2.9 GiB
Commit graph

4154 commits

Author SHA1 Message Date
Arthur
e3784bc237 Complete spawn beam command 2022-07-11 16:41:35 +03:00
Arthur
acc2fd5a55 Start creating spawn beam command 2022-07-11 02:15:30 +03:00
Arthur
d07d294b91 Remove fire verb from terminal 2022-07-09 22:32:46 +03:00
Arthur
f6e950cbf7 Update locale keys 2022-07-09 22:32:09 +03:00
Arthur
ddd080f5f8 Add simple terminal UI for firing 2022-07-09 22:29:10 +03:00
Arthur
925ec94daf Dont call Ignite with visual update at every tick 2022-07-09 18:03:32 +03:00
Arthur
9e868145ff Correct beam spawning directed in center of station 2022-07-09 17:55:31 +03:00
Arthur
1e9966e946 Start work on beam spawn & launch direction 2022-07-08 20:57:19 +03:00
Arthur
a3dab14c6c Rename stuff & add move separate launch method 2022-07-08 20:57:09 +03:00
Arthur
586cf26f0f Add arson radius for beam 2022-07-08 05:16:36 +03:00
Arthur
24b3223403 Use ambient component for loop sound 2022-07-08 02:55:35 +03:00
Arthur
dc2f707f12 Add states & preparing phase 2022-07-06 04:09:42 +03:00
Arthur
4793eaa494 Copy singularity destroy logic to beam 2022-07-06 00:34:51 +03:00
Arthur
54834dbb07 Remove IcarusBeam comments 2022-07-04 17:18:21 +03:00
Arthur
8941193a0f Terminal spawn IcarusBeam 2022-07-04 17:16:03 +03:00
Arthur
c3d4e811db Add loop sound & destroying all 2022-07-04 17:12:49 +03:00
Arthur
c0794feada Basic Icarus beam 2022-07-03 16:40:03 +03:00
Arthur
f6598c255b Merge branch 'master' into icarus 2022-06-29 16:50:41 +03:00
Arthur
8235b39f4b Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-29 01:56:31 +03:00
Moony
9457416090
OH NO THE SERVER IS DYING (#9259) 
Fix a typo that hangs the server.
 2022-06-28 15:07:06 -05:00
Arthur
e1e7dc2a9d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
 2022-06-28 22:33:18 +03:00
Rane
e86e6a5cce
Port research disks from nyano (#9081) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-29 00:41:08 +10:00
metalgearsloth
5885e108ae
Fix master merge (#9254) 2022-06-28 23:39:48 +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
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
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
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
Júlio César Ueti
bda1999675
Adjust alert level volumes (#9145) 
* Finally

* Requested adjustments
 2022-06-27 13:45:01 -07:00
metalgearsloth
1633d7fbb5
Bump cuff times (#9227) 2022-06-27 09:28:04 -07: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
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
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
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
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
Leon Friedrich
07a35e8363
Stop radio channels from being malformed. (#9210) 2022-06-27 13:56:38 +10:00
metalgearsloth
a6a5bfa697
Fix emergency shuttle docking causing grid overlap (#9197) 2022-06-27 03:48:49 +10:00
metalgearsloth
3787d27769
Nerf singulo pulling (#9181) 2022-06-26 23:54:18 +10:00
Arthur
f570a9de6c Basic fire system 2022-06-26 16:52:33 +03:00
metalgearsloth
135da07102
Don't allow you to melee attack yourself (#9178) 
There may be some situations to allow it but in actual combat if you have a big sprite like space dragon it's VERY easy to hit yourself and do sizeable damage.
 2022-06-26 04:25:29 -05:00
metalgearsloth
ef0aa51e41
Eshuttle doors and colour (#9175) 2022-06-26 18:19:27 +10:00