Commit Graph
45879 Commits
Author SHA1 Message Date
evan 93c322f494 a 2022-02-21 18:23:41 -05:00
evan 4d403ebca5 Update miscellaneous.dm 2022-02-21 18:14:56 -05:00
evan 6b3fb90ef6 keep the cold in 2022-02-21 17:44:27 -05:00
Changelogs c410593ddc Automatic changelog compile [ci skip] 2022-02-21 00:33:20 +00:00
CitadelStationBot 7dde500a19 Automatic changelog generation for PR #15414 [ci skip] 2022-02-20 18:02:24 -06:00
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
siliconsandGitHub 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
LatteKatandGitHub 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
TripleShades 6e429c2742 Update OmegaStation.dmm 2022-02-18 17:49:56 -05:00
TripleShades a2f16c916d Update OmegaStation.dmm 2022-02-18 17:42:54 -05:00
CitadelStationBot 2db175fc48 Automatic changelog generation for PR #15359 [ci skip] 2022-02-18 16:38:53 -06:00
Timothy TeakettleandGitHub 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
TripleShades f7dcc2d297 Update OmegaStation.dmm 2022-02-18 17:35:19 -05:00
Changelogs ece8ccf5b2 Automatic changelog compile [ci skip] 2022-02-17 00:28:57 +00:00
LinandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 5b75509603 Merge pull request #15265 from keronshb/familyport
(Ready for Testing) Ports MRP Families and hardsync
2022-02-13 02:32:26 -08:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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