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

5314 commits

Author SHA1 Message Date
Morbo
11c5ecf880 Move Icarus to dir & use timing instead of accum 2023-01-08 00:28:16 +03:00
Morbo
9c6a393617 Why i did this 2023-01-08 00:28:15 +03:00
Morbo
eba81123e7 Squashed commit of Icarus 
commit e3784bc237
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 11 16:41:35 2022 +0300

    Complete spawn beam command

commit acc2fd5a55
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 11 02:15:30 2022 +0300

    Start creating spawn beam command

commit 179116cc22
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jul 10 01:41:20 2022 +0300

    Update UI button & add timer and cooldown

commit d07d294b91
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 22:32:46 2022 +0300

    Remove fire verb from terminal

commit f6e950cbf7
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 22:32:09 2022 +0300

    Update locale keys

commit 4410380abc
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 22:30:05 2022 +0300

    Fix locale

commit ddd080f5f8
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 22:29:10 2022 +0300

    Add simple terminal UI for firing

commit 925ec94daf
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 18:03:32 2022 +0300

    Dont call Ignite with visual update at every tick

commit 9e868145ff
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jul 9 17:55:31 2022 +0300

    Correct beam spawning directed in center of station

commit 1e9966e946
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 20:57:19 2022 +0300

    Start work on beam spawn & launch direction

commit a3dab14c6c
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 13:48:02 2022 +0300

    Rename stuff & add move separate launch method

commit 586cf26f0f
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 05:16:36 2022 +0300

    Add arson radius for beam

commit 9b76fc7d74
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 03:02:12 2022 +0300

    Use AllMask for fixture beam

commit 24b3223403
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 02:55:35 2022 +0300

    Use ambient component for loop sound

commit a477e2f64f
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jul 8 02:54:57 2022 +0300

    Combine sun ray sprites in one

commit dc2f707f12
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Wed Jul 6 04:09:42 2022 +0300

    Add states & preparing phase

commit 888f5714dc
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Wed Jul 6 00:35:05 2022 +0300

    Tweak beam component

commit 4793eaa494
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Wed Jul 6 00:34:35 2022 +0300

    Copy singularity destroy logic to beam

commit 9f0a8ca631
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:37:49 2022 +0300

    Fix terminal parent

commit bdc027444f
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:37:34 2022 +0300

    No rotation for beam

commit 54834dbb07
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:18:21 2022 +0300

    Remove IcarusBeam comments

commit 8941193a0f
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:16:03 2022 +0300

    Terminal spawn IcarusBeam

commit 993b4315bb
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:12:58 2022 +0300

    Revert "Concatenate images to one"

    This reverts commit acfe951a0c.

commit c3d4e811db
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Mon Jul 4 17:12:49 2022 +0300

    Add loop sound & destroying all

commit acfe951a0c
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jul 3 16:47:21 2022 +0300

    Concatenate images to one

commit c0794feada
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jul 3 16:40:03 2022 +0300

    Basic Icarus beam

commit f6598c255b
Merge: f570a9de6c c3a759f848
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Wed Jun 29 16:50:41 2022 +0300

    Merge branch 'master' into icarus

commit f570a9de6c
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jun 26 16:52:33 2022 +0300

    Basic fire system

commit 4591833d81
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jun 26 07:16:52 2022 +0300

    Add announcements & activation verb

commit a99c5c3488
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jun 26 06:39:24 2022 +0300

    Move system to server and add basic fire logic

commit 6df2a1a571
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jun 26 04:39:30 2022 +0300

    Use ItemSlots component for simplicity

commit ab44d02630
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sun Jun 26 03:35:02 2022 +0300

    Add basic key insert to slot

commit dafe921ac4
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Sat Jun 25 17:11:41 2022 +0300

    Add sounds

commit 445a0d544f
Merge: 9864bae192 937ee3da02
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jun 24 06:33:45 2022 +0300

    Merge branch 'master' into icarus

commit 9864bae192
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jun 24 04:33:24 2022 +0300

    Add basic server icarus components

commit 184bd103b0
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jun 24 03:39:24 2022 +0300

    Add to machine meta

commit a88eb38484
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jun 24 03:39:13 2022 +0300

    Update terminal sprites

commit d88fe1c1c4
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Fri Jun 24 03:28:55 2022 +0300

    Add computer goldeneye sprites to machines

commit 81fb2c02a2
Author: Arthur <14136326+Morb0@users.noreply.github.com>
Date:   Thu Jun 23 16:04:49 2022 +0300

    Add sprites
 2023-01-07 17:27:46 +03:00
Morbo
8434c9cd9f Use custom starting gear 2023-01-07 06:14:10 +03:00
Morbo
b6fc63a61d Use custom map 2023-01-07 05:31:57 +03:00
Morbo
bd18265088 Add custom spawnpoint 2023-01-07 05:08:37 +03:00
Morbo
da7170e600 Add todos 2023-01-07 04:58:42 +03:00
Morbo
e9b053c856 Add round end screen info 2023-01-07 04:55:07 +03:00
Morbo
d5afa731cf Assault Ops gamemode barebones 2023-01-07 04:41:31 +03:00
Morbo
b5a246e443 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-05 16:59:25 +03:00
metalgearsloth
1769807366
Remove some explosion resolves (#13330) 2023-01-04 17:52:38 -08:00
keronshb
a9d61ca6e8
Fixes quick dialog exception (#13189) 
closes https://github.com/space-wizards/space-station-14/issues/13017
 2023-01-05 06:27:25 +11:00
Kara
07360a4c95
EmitSound prediction (#13282) 2023-01-05 05:56:35 +11:00
778b
ba0510b62e
Refactored PowerNet (#13287) 
Closes https://github.com/space-wizards/space-station-14/issues/12353
 2023-01-05 05:43:05 +11:00
Chief-Engineer
1ceff51a69
Add mind and ghost logs (#13306) 2023-01-03 22:49:15 -08:00
Chief-Engineer
0907989e94
Add DisposalUnit logs (#13309) 2023-01-03 22:45:35 -08:00
vanx
f7d2da0fe0
Doubled the papers symbol limit (#13311) 
Co-authored-by: vanx <vanx#5477>
 2023-01-03 22:44:17 -08:00
Kara
b170b823eb
More artifact effects (#13300) 2023-01-03 15:13:10 -08:00
Morbo
4dec9dfbaa Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/Recipes/Lathes/sheet.yml
 2023-01-03 15:21:22 +03:00
Kara
5eacde3da7
Hand teleporter / portal tweaks (#13305) 2023-01-02 23:53:16 -08:00
metalgearsloth
ab07944af8
Remove IPhysBody (#13297) 2023-01-03 17:45:18 +11:00
dontbetank
05c02540e6
fix this thing (#13285) 2023-01-02 23:39:53 -06:00
Chief-Engineer
4972d74788
add maintenance panel logs (#13298) 2023-01-02 23:34:11 -06:00
Chief-Engineer
1a0c3e8386
Add welding logs (#13299) 2023-01-02 20:39:48 -08:00
Chief-Engineer
90f8db67fa
Add airlock painting logs (#13301) 2023-01-02 20:39:11 -08:00
Kara
c821ca71aa
Portals & hand teleporter (#13266) 
* basic system with portals & linked ents

* hand tele sprites, no impl

* hand tele and teleportation works

* fancy it up

* oog

* special case projectiles

* predict portal-to-portal teleportation

* this stuff

* check nullspace

* sloth

* give to rd instead

* i guess this can probably happen

* docs
 2023-01-02 19:58:25 -06:00
Nemanja
0b5000dc76
Grenade Penguin 2: The Reckoning (#13278) 2023-01-01 17:18:47 -08:00
keronshb
f6e1dc15ac
Adds delay to internals alert (#13195) 
closes https://github.com/space-wizards/space-station-14/issues/12721
 2023-01-01 16:03:19 -08:00
Leon Friedrich
b33d1f003b
Add RGB staff (#13125) 2023-01-01 16:01:40 -08:00
Nemanja
4a7c0b94b2
Make emitter use guncode (#13258) 2023-01-01 15:54:47 -08:00
Vordenburg
5553976d70
Add supplies to restock vending machines. (#11506) 2023-01-01 15:42:56 -08:00
Theomund
d638ad421a
Add recipient to air gush message and change pop-up type (#13262) 2023-01-02 06:42:21 +11:00
Checkraze
1edd00e50c
makes GetDocks and FoundOrganics public (#13260) 2023-01-01 17:44:30 +11:00
metalgearsloth
50f23ebf13
Fix docking configs (#13256) 
* Fix docking configs

* fixes

* fucking rouny

* a
 2023-01-01 00:33:51 -06:00
Vordenburg
efb7e0cc22
Complete #5177 (#12724) 
Resolves https://github.com/space-wizards/space-station-14/issues/4832
 2022-12-31 22:21:26 -08:00
Kupie
e2467bf858
Redirects :h to department radio channel for headsets (#13026) 2022-12-31 22:20:04 -08:00
Nemanja
6d6d1f17f1
artifact griefing on round-end (#13205) 2022-12-31 22:16:09 -08:00
Nemanja
06a80422b5
machine frame tweaks (#13248) 
Closes https://github.com/space-wizards/space-station-14/issues/11547
Closes https://github.com/space-wizards/space-station-14/issues/11549
 2022-12-31 22:06:31 -08:00
Leon Friedrich
bce1f9fe89
Mopping and puddle tweaks (#13238) 
fix undefined
Fixes https://github.com/space-wizards/space-station-14/issues/11830
 2022-12-31 22:03:26 -08:00
Nemanja
01ef7a2d1b
Good artifact effects (#13223) 2022-12-31 21:59:38 -08:00
metalgearsloth
2287f9df11
Fix bloodstream nullref exception (#13243) 
Fixes https://github.com/space-wizards/space-station-14/issues/13018
 2022-12-31 21:58:00 -08:00
Theomund
747567f35d
Sort crew manifest by name and job title (#13212) 
resolves https://github.com/space-wizards/space-station-14/issues/12106
 2022-12-31 21:49:30 -08:00
Leon Friedrich
ccac9efc26
Fix two small ambient sound bugs. (#13249) 2023-01-01 11:40:22 +11:00
Morbo
88d2445740 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/origin.yml
 2023-01-01 01:21:40 +03:00
keronshb
ca40c0fce2
Checks if a buckled entity is terminating before reparent (#13202) 2022-12-31 04:22:06 +11:00
Nemanja
e1b1541c56
adjust artifact probability equation (#13229) 2022-12-31 04:21:39 +11:00
Nemanja
0a1485a99d
Fix possible error in artifact node generation (#13231) 2022-12-31 04:03:16 +11:00
Francesco
21cc60bcb9
fix: cryo pod autoinjection works once again. (#13213) 2022-12-31 01:34:59 +11:00
Leon Friedrich
ae58bb1f1b
Store ambient sound entities on a component tree. (#13110) 2022-12-30 15:10:14 +11:00
metalgearsloth
0d7423c01d
Cleanup speech and emoting comps (#13194) 
Networks speech and removes the shared prefix from emoting.
I have no idea if emoting is even being used or plan to be used in the interim.
 2022-12-27 18:03:25 +01:00