cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

45908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lin
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
Lin
05f86ba5a4 Merge pull request #15527 from TripleShades/fuck 
Omega Solars + two things
 2022-02-24 08:27:30 +00:00
Lin
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 Teakettle
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
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
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
TripleShades
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
SandPoot
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
TripleShades
f2c14bcaf2 Update OmegaStation.dmm 2022-02-22 03:28:39 -05:00
Putnam3145
8764391f6e Fixes siphoning vents to be labeled right 2022-02-21 22:17:43 -08:00
Putnam3145
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
Putnam3145
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
silicons
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
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport 
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
 2022-02-21 00:02:21 +00:00
CitadelStationBot
b932828a7f Automatic changelog generation for PR #15515 [ci skip] 2022-02-19 21:25:22 -06:00
Lin
804e4c0420 Merge pull request #15515 from Putnam3145/fix-plasma-glass-window 
Makes reinforced plasma glass windows buildable
 2022-02-20 03:25:19 +00:00
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08:00
CitadelStationBot
51a6b35a3c Automatic changelog generation for PR #15510 [ci skip] 2022-02-19 19:08:53 -06:00
Lin
5e38f2fa21 Merge pull request #15510 from TripleShades/omega-fix 
Omega Station Fixes/Tweaks
 2022-02-20 01:08:50 +00:00
CitadelStationBot
e26452bd68 Automatic changelog generation for PR #15513 [ci skip] 2022-02-19 19:08:30 -06:00
Lin
348cc64688 Merge pull request #15513 from Putnam3145/auxmos-build 
Fixes the linux auto-compile
 2022-02-20 01:08:27 +00:00
Changelogs
92124c706d Automatic changelog compile [ci skip] 2022-02-20 00:38:24 +00:00
silicons
b62b64047b Merge pull request #15512 from Citadel-Station-13/fixesafuckup 
Readds content-requiring-prior-approval section in contributing.md (and tweaks it lightly!)
 2022-02-19 13:38:00 -08:00
Putnam3145
912d2e4eb8 fixes the linux auto-compile 2022-02-19 12:28:16 -08:00
CitadelStationBot
ea491b6e9d Automatic changelog generation for PR #15506 [ci skip] 2022-02-19 13:43:43 -06:00
LatteKat
b2534150ae Switch to katmos equalization (#15506) 
* katmos

* features
 2022-02-19 11:43:40 -08:00
deathride58
2da8891186 Tweaks the text lightly for additional clarity and less aggression 2022-02-18 22:33:35 -05:00
deathride58
068650fc61 Readds content-requiring-prior-approval section in contributing 2022-02-18 21:35:16 -05:00
Changelogs
c690c618b0 Automatic changelog compile [ci skip] 2022-02-19 00:35:12 +00:00
TripleShades
7a0ebafe43 Update OmegaStation.dmm 2022-02-18 17:51:34 -05:00