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

10992 commits

This branch
This branch
All branches
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
179116cc22 Update UI button & add timer and cooldown 2022-07-10 01:41:20 +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
4410380abc Fix locale 2022-07-09 22:30:05 +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
9b76fc7d74 Use AllMask for fixture beam 2022-07-08 03:02:12 +03:00
Arthur
24b3223403 Use ambient component for loop sound 2022-07-08 02:55:35 +03:00
Arthur
a477e2f64f Combine sun ray sprites in one 2022-07-08 02:54:57 +03:00
Arthur
dc2f707f12 Add states & preparing phase 2022-07-06 04:09:42 +03:00
Arthur
888f5714dc Tweak beam component 2022-07-06 00:35:05 +03:00
Arthur
4793eaa494 Copy singularity destroy logic to beam 2022-07-06 00:34:51 +03:00
Arthur
9f0a8ca631 Fix terminal parent 2022-07-04 17:37:49 +03:00
Arthur
bdc027444f No rotation for beam 2022-07-04 17:37:34 +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
993b4315bb Revert "Concatenate images to one" 
This reverts commit acfe951a0c.
 2022-07-04 17:12:58 +03:00
Arthur
c3d4e811db Add loop sound & destroying all 2022-07-04 17:12:49 +03:00
Arthur
acfe951a0c Concatenate images to one 2022-07-03 16:47:21 +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
IanComradeBot
c3a759f848 Automatic changelog update 2022-06-29 00:57:33 +00:00
Morber
5e90aed713
Merge pull request #282 from space-syndicate/upstream-sync 
Upstream sync
 2022-06-29 03:56:26 +03:00
Arthur
fb5754b0e1 Fix round-end-system.ftl 2022-06-29 03:27:42 +03:00
Arthur
8235b39f4b Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-29 01:56:31 +03:00
themias
9064360fbc
Remove BreathMask component from sterile masks (#9257) 2022-06-29 07:45:36 +10:00
Arthur
745f8164ad Update locale 2022-06-28 23:40:09 +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
793f0e1281
Revert "Pillar update (#9126)" (#9255) 2022-06-29 00:29:36 +10:00
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