shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,785 Commits 5 Branches 0 Tags
e25aa3cf612f252ef852a39db4e014cbc0fbe657
Commit Graph

45785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Changelogs
e25aa3cf61 Automatic changelog compile [ci skip] 2022-02-08 00:29:49 +00:00
CitadelStationBot
fe90b64c44 Automatic changelog generation for PR #15460 [ci skip] 2022-02-07 17:17:27 -06:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
CitadelStationBot
e089be0de9 Automatic changelog generation for PR #15499 [ci skip] 2022-02-06 22:14:11 -06:00
silicons
ab12f2eef9 Merge pull request #15499 from SandPoot/quick-fix 
Snaps "Convert Lineendings"
 2022-02-06 20:14:08 -08:00
SandPoot
f0753a4ddd Update compile_changelogs.yml 2022-02-04 22:26:57 -03:00
CitadelStationBot
baf07c8e7d Automatic changelog generation for PR #15482 [ci skip] 2022-02-04 15:20:46 -06:00
silicons
3dba8ef807 Merge pull request #15482 from SandPoot/balloon-alert-port 
Ports Balloon Alert from TG
 2022-02-04 13:20:43 -08:00
CitadelStationBot
c690f84231 Automatic changelog generation for PR #15492 [ci skip] 2022-02-04 10:20:55 -06:00
silicons
7c3a541e31 Merge pull request #15492 from SandPoot/changelogs-tgui 
Ports tgstation/58593
 2022-02-04 08:20:49 -08:00
SandPoot
7e970fe5f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-04 13:06:20 -03:00
CitadelStationBot
3f58e7c1bc Automatic changelog generation for PR #15487 [ci skip] 2022-02-04 09:59:12 -06:00
silicons
531afa7d90 Merge pull request #15487 from DeltaFire15/stabilized-orange-fix-nerf 
Fixes / nerfs stabilized orange extract temp adjustments and tweaks its effects on Synthetics
 2022-02-04 07:59:09 -08:00
CitadelStationBot
a647f1ebf5 Automatic changelog generation for PR #15484 [ci skip] 2022-02-04 09:58:46 -06:00
silicons
c0e097f589 Merge pull request #15484 from DeltaFire15/adaptation 
Space Adaptation nulls low-pressure cooling penalties of passive cooling for Synthetics.
 2022-02-04 07:58:44 -08:00
CitadelStationBot
7f0e878485 Automatic changelog generation for PR #15444 [ci skip] 2022-02-04 09:58:32 -06:00
silicons
6708bfb668 Merge pull request #15444 from LiteralMushroom/patch-6 
Literally just makes it so slimes can have (decorative) wings.
 2022-02-04 07:58:29 -08:00
CitadelStationBot
79d71cbef7 Automatic changelog generation for PR #15448 [ci skip] 2022-02-04 09:58:15 -06:00
silicons
b94d00e934 Merge pull request #15448 from CoreFlare/hi-yes-we-want-wings-too 
literally also just makes it so IPCs can have winges
 2022-02-04 07:58:13 -08:00
CitadelStationBot
7fbdbd4cbd Automatic changelog generation for PR #15480 [ci skip] 2022-02-04 09:57:53 -06:00
silicons
4c8c7d5872 Merge pull request #15480 from SandPoot/cancel-action 
Allows you to cancel actions
 2022-02-04 07:57:50 -08:00
CitadelStationBot
fbb0ebcc18 Automatic changelog generation for PR #15485 [ci skip] 2022-02-04 09:57:38 -06:00
silicons
a5d0048c0c Merge pull request #15485 from SandPoot/bgone-layer 
Removes layer from /atom/movable/screen
 2022-02-04 07:57:36 -08:00
CitadelStationBot
4835402f55 Automatic changelog generation for PR #15491 [ci skip] 2022-02-04 09:57:24 -06:00
silicons
be82946ff6 Merge pull request #15491 from SandPoot/autolathe-tgui 
Ports TGUI for autolathe
 2022-02-04 07:57:22 -08:00
CitadelStationBot
de3e961573 Automatic changelog generation for PR #15493 [ci skip] 2022-02-04 09:55:35 -06:00
silicons
5400def46a Merge pull request #15493 from SandPoot/bots-tgui 
Ports Simplebot TGUI conversion
 2022-02-04 07:55:32 -08:00
CitadelStationBot
67ce181aff Automatic changelog generation for PR #15494 [ci skip] 2022-02-04 09:55:26 -06:00
silicons
be0aba492f Merge pull request #15494 from SandPoot/custom-shuttle-ui 
TGUIzes the Custom Shuttle
 2022-02-04 07:55:23 -08:00
CitadelStationBot
c75c498684 Automatic changelog generation for PR #15466 [ci skip] 2022-02-03 21:34:17 -06:00
Sakura
08b38a7e70 Ashwalker Update (#15466) 
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-02-03 19:34:15 -08:00
Changelogs
72ca4b6a8e Automatic changelog compile [ci skip] 2022-02-04 00:29:03 +00:00
Changelogs
ff31a6cda1 Automatic changelog compile [ci skip] 2022-02-03 00:29:06 +00:00
SandPoot
0fca5f80eb i have three different js linters and one says that the other is wrong. 2022-02-02 18:51:26 -03:00
SandPoot
8acb800301 Upload files 2022-02-02 17:57:48 -03:00
SandPoot
6d2680d7ec Update files 2022-02-02 12:31:20 -03:00
SandPoot
a444672abe Cit 2022-02-02 02:38:08 -03:00
SandPoot
283830a9ed oops 2022-02-02 02:17:09 -03:00
SandPoot
e3a4542ddd PLEASE DON'T MERGE WHEN I- AAAAAAAA 2022-02-02 02:12:13 -03:00
SandPoot
4c93bfc764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-02 02:07:13 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
CitadelStationBot
79058b2b6d Automatic changelog generation for PR #15488 [ci skip] 2022-02-01 22:59:39 -06:00
Lin
daa8032712 Merge pull request #15488 from BlueWildrose/getouttathewaynerd 
Get out of the way, you weaboos. The slimes were here first.
 2022-02-02 04:59:36 +00:00
Lin
cc3ea5bf7d Merge pull request #14804 from Citadel-Station-13/pokerchips 
[Ready] pokerchip set donator item
 2022-02-02 04:59:17 +00:00
Linzolle
ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
SandPoot
760ed48476 Upload files 2022-02-02 00:45:32 -03:00
Changelogs
03f0eae6f7 Automatic changelog compile [ci skip] 2022-02-02 00:31:30 +00:00
Changelogs
5599b43f3b Automatic changelog compile [ci skip] 2022-02-01 00:30:22 +00:00
CitadelStationBot
1bdac7efea Automatic changelog generation for PR #15490 [ci skip] 2022-01-31 18:24:20 -06:00
silicons
7a95fb03ff Merge pull request #15490 from SpiWat/patch-2 
Tweenty --> Twenty
 2022-01-31 17:24:17 -07:00