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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,850 Commits 55 Branches 0 Tags
2da889118686176f912b74fa462a0f237ec52bba
Commit Graph

45850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CitadelStationBot
2db175fc48 Automatic changelog generation for PR #15359 [ci skip] 2022-02-18 16:38:53 -06:00
Timothy Teakettle
c9051a6a08 adds polychromic clown outfit and mask (#15359) 
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
 2022-02-18 14:38:50 -08:00
Changelogs
ece8ccf5b2 Automatic changelog compile [ci skip] 2022-02-17 00:28:57 +00:00
Lin
4aad2d210a Merge pull request #15507 from silicons/blah 
fixes linter errors
 2022-02-16 05:35:56 +00:00
silicons
984f37cc80 fix 2022-02-15 22:03:27 -07:00
CitadelStationBot
ad6d9a15ec Automatic changelog generation for PR #15504 [ci skip] 2022-02-15 22:58:45 -06:00
silicons
884c2b4781 Merge pull request #15504 from SandPoot/job-exp-exemption 
Re-adds the admin button to let them exempt players from job exp requirements.
 2022-02-15 20:58:43 -08:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
SandPoot
a3d9dd2c99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into job-exp-exemption 2022-02-15 18:35:23 -03:00
SandPoot
52a8fe276b Update files 2022-02-15 18:27:33 -03:00
Changelogs
93ccd18061 Automatic changelog compile [ci skip] 2022-02-14 00:29:57 +00:00
CitadelStationBot
ec0aa7e503 Automatic changelog generation for PR #15265 [ci skip] 2022-02-13 04:32:29 -06:00
silicons
5b75509603 Merge pull request #15265 from keronshb/familyport 
(Ready for Testing) Ports MRP Families and hardsync
 2022-02-13 02:32:26 -08:00
silicons
4632c85d71 silly proof of concept item (#15456) 
* should have listened to putnam

* why am i doing this

* that

* lmao

* more

* it compiles

* it compiles

* fixes

* FUNNY GLOW SWORD

* more..

* unterminated text

* wthat wasn't working

* it's coming together

* woo

* what have i done

* fin.

* eh
 2022-02-11 21:04:21 -08:00
silicons
a1bb992d59 Merge pull request #15327 from Citadel-Station-13/linuxbuild 
Tiny change to the build.sh file
 2022-02-11 20:36:47 -08:00
keronshb
83dbbbf400 Fixes the missing icons. 2022-02-11 20:58:31 -05:00
keronshb
eb7d0bfe71 Last of the linter fixes 2022-02-11 20:35:56 -05:00
keronshb
d84c1d136f Removes an unused line of code from tgstation 2022-02-11 15:58:34 -05:00
keronshb
cc249e1e85 Fixes some linter issues 2022-02-11 15:54:03 -05:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Changelogs
05b3a96ac7 Automatic changelog compile [ci skip] 2022-02-08 00:53:54 +00:00
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