shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,936 Commits 5 Branches 0 Tags
edd3a510f13dc7ce9774cf7b9793908cec5bc22d
Commit Graph
45936 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda 
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
 2022-02-26 18:08:47 -07:00
CitadelStationBot ae2c49b472 Automatic changelog generation for PR #15528 [ci skip] 2022-02-26 19:08:30 -06:00
siliconsandGitHub bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system 
[PORT] Removes the non bitflag slot defines
 2022-02-26 18:08:28 -07:00
CitadelStationBot 6da623250f Automatic changelog generation for PR #15505 [ci skip] 2022-02-26 19:08:21 -06:00
siliconsandGitHub 87e58fcc14 Merge pull request #15505 from SandPoot/playertimes-tgui 
Player Playtime TGUI
 2022-02-26 18:08:18 -07:00
CitadelStationBot 89a6385e15 Automatic changelog generation for PR #15503 [ci skip] 2022-02-26 19:08:15 -06:00
siliconsandGitHub fe427e7516 Merge pull request #15503 from Arturlang/Bodybuilding 
Lets the limbgrower make mobs with only a chest
 2022-02-26 18:08:12 -07:00
CitadelStationBot 6ec93ab8c9 Automatic changelog generation for PR #15495 [ci skip] 2022-02-26 19:08:07 -06:00
siliconsandGitHub 2ec2c4478d Merge pull request #15495 from Putnam3145/dynamic_holiday 
Weekly high-chaos dynamic days
 2022-02-26 18:08:04 -07:00
Changelogs fb8158e893 Automatic changelog compile [ci skip] 2022-02-26 00:33:23 +00:00
SandPoot f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot de96a68bf5 mistake 2022-02-25 17:01:48 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot 87d30e1a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-25 16:04:22 -03:00
CitadelStationBot 178387e47b Automatic changelog generation for PR #15523 [ci skip] 2022-02-24 22:41:57 -06:00
LinandGitHub fd84b21350 Merge pull request #15523 from Citadel-Station-13/Putnam3145-patch-1 
Change BOMB_TARGET_SIZE to match new trit fire
 2022-02-25 04:41:54 +00:00
Changelogs 83c6e74349 Automatic changelog compile [ci skip] 2022-02-25 00:35:49 +00:00
CitadelStationBot b0b05c9e62 Automatic changelog generation for PR #15527 [ci skip] 2022-02-24 02:27:33 -06:00
LinandGitHub 05f86ba5a4 Merge pull request #15527 from TripleShades/fuck 
Omega Solars + two things
 2022-02-24 08:27:30 +00:00
LinandGitHub 64697f6663 Merge pull request #15524 from Citadel-Station-13/Putnam3145-patch-2 
Fixes siphoning vents to be labeled right
 2022-02-24 06:23:58 +00:00
CitadelStationBot 0bf197feb2 Automatic changelog generation for PR #15514 [ci skip] 2022-02-23 23:01:16 -06:00
Timothy TeakettleandGitHub f6b9858f4f adds snake coiling (#15514) 
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
 2022-02-23 22:01:13 -07:00
SandPoot a0d0df5ae9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-23 19:19:57 -03:00
Timothy Teakettle 027002f928 haha what if we didn't show secretcatchem 2022-02-23 12:07:03 +00:00
Timothy Teakettle 56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
TripleShades 1678d8a551 Update OmegaStation.dmm 2022-02-23 02:51:55 -05:00
TripleShades e49f5c4d84 Update OmegaStation.dmm 2022-02-23 00:36:47 -05:00
TripleShades 982b29d505 Update OmegaStation.dmm 2022-02-22 23:21:34 -05:00
TripleShades d96c703d88 Update OmegaStation.dmm 2022-02-22 23:21:00 -05:00
timothyteakettle 4adb870324 improves formatting of the couldn't find reagent text 2022-02-23 00:57:39 +00:00
timothyteakettle b578c65d74 fixes 2022-02-23 00:52:17 +00:00
Changelogs 8bfbe427d3 Automatic changelog compile [ci skip] 2022-02-23 00:38:38 +00:00
CitadelStationBot dcad695889 Automatic changelog generation for PR #15519 [ci skip] 2022-02-22 16:50:59 -06:00
TripleShadesandGitHub 42c29ab318 More Omega (#15519) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm
 2022-02-22 15:50:56 -07:00
CitadelStationBot 74abf95c32 Automatic changelog generation for PR #15521 [ci skip] 2022-02-22 16:50:35 -06:00
SandPootGitHubChangelogs
 		6c347a9186 Fixes targets (#15521) 
* Automatic changelog compile [ci skip]

* Update files

Co-authored-by: Changelogs <action@github.com>
 2022-02-22 15:50:32 -07:00
Timothy Teakettle fd997e1615 initial test changes 2022-02-22 21:59:28 +00:00
TripleShades f2c14bcaf2 Update OmegaStation.dmm 2022-02-22 03:28:39 -05:00
Putnam3145andGitHub 8764391f6e Fixes siphoning vents to be labeled right 2022-02-21 22:17:43 -08:00
Putnam3145andGitHub 6fb26a5afc Raised sub target exponent too 
Needs to be this way so plasma bombs aren't way stronger
 2022-02-21 21:05:11 -08:00
Putnam3145andGitHub 87e4f9353f Change BOMB_TARGET_SIZE to match new trit fire 
I am SO GLAD I WROTE THIS CODE THIS WAY.
 2022-02-21 20:57:56 -08:00
siliconsandGitHub de3ea65587 fixes parallax whitifier applying when parallax is disabled (#15516) 
* :)

* 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

* a

* woops
 2022-02-21 17:20:41 -07:00
TripleShades 85569cc9a8 Update OmegaStation.dmm 2022-02-21 15:12:37 -05:00
TripleShades a127b49599 Update OmegaStation.dmm 2022-02-20 23:14:20 -05:00
TripleShades 11bfc18714 Update OmegaStation.dmm 2022-02-20 22:57:59 -05:00
TripleShades 3e1e24f6a0 Update OmegaStation.dmm 2022-02-20 22:47:44 -05:00
Changelogs b032c8b1b2 Automatic changelog compile [ci skip] 2022-02-21 00:53:36 +00:00
Changelogs c410593ddc Automatic changelog compile [ci skip] 2022-02-21 00:33:20 +00:00
SandPoot 6f80be077c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-20 21:13:55 -03:00
CitadelStationBot 7dde500a19 Automatic changelog generation for PR #15414 [ci skip] 2022-02-20 18:02:24 -06:00