Commit Graph

39162 Commits

Author SHA1 Message Date
Timothy Teakettle 022f996cfa better fix 2020-11-05 17:28:32 +00:00
timothyteakettle 8126eb5a12 fixes a lot of things 2020-11-02 23:07:27 +00:00
timothyteakettle f34882cf60 Update preferences_savefile.dm 2020-11-01 23:27:34 +00:00
timothyteakettle ede19dd47d Update preferences_savefile.dm 2020-11-01 23:25:09 +00:00
Timothy Teakettle 22823f629d an actual fix 2020-11-01 20:40:08 +00:00
Timothy Teakettle e78383f4fa typo 2020-10-30 19:42:02 +00:00
Timothy Teakettle f4f322dd0e better fix 2020-10-30 19:39:43 +00:00
timothyteakettle 87be4581d7 better 2020-10-27 22:14:35 +00:00
timothyteakettle cf49e78d45 Merge remote-tracking branch 'upstream/master' into i-hate-mcolor 2020-10-27 22:12:55 +00:00
timothyteakettle 3c25b244f2 Merge branch 'master' into i-hate-mcolor 2020-10-27 22:12:38 +00:00
timothyteakettle a987420d22 fix for mam markings 2020-10-27 21:40:07 +00:00
timothyteakettle a9f2b86da9 tonne of fixes 2020-10-27 21:32:08 +00:00
Changelogs f73437e97e Automatic changelog compile [ci skip] 2020-10-27 01:06:41 +00:00
Changelogs 4304ac556c Automatic changelog compile [ci skip] 2020-10-26 01:06:27 +00:00
CitadelStationBot e3136eb834 Automatic changelog generation for PR #13611 [ci skip] 2020-10-25 08:15:05 -05:00
MrJWhit c860cc78df Giving science a space loop on every map (#13611)
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
2020-10-25 14:15:01 +01:00
CitadelStationBot b8f34814fa Automatic changelog generation for PR #13586 [ci skip] 2020-10-25 08:10:50 -05:00
Heretical Lizard 576c74dc5f Resprites the brass claw to make it more like a cwc weapon (#13586)
No more cheetos blade. Also sorts its file to be next to the spear, purely because that annoyed me that it wasn't next to the other weapon,

Co-authored-by: Dan-Neposh <keatesequoy@gmail.com>
2020-10-25 14:10:48 +01:00
CitadelStationBot f1a7871748 Automatic changelog generation for PR #13599 [ci skip] 2020-10-25 07:07:49 -05:00
Delams-The-SM 52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
Changelogs 7c72d121da Automatic changelog compile [ci skip] 2020-10-25 01:07:02 +00:00
LetterJay c4f25e3114 Fixes donator item (#13609) 2020-10-24 21:24:05 +02:00
CitadelStationBot cc628f46d9 Automatic changelog generation for PR #13598 [ci skip] 2020-10-24 14:23:56 -05:00
Arturlang d3616f2d17 Fixes hijack UI (#13598)
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
2020-10-24 21:23:52 +02:00
silicons 585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
silicons 3293715025 Update items.dm (#13622) 2020-10-24 21:22:01 +02:00
CitadelStationBot 04920b6960 Automatic changelog generation for PR #13608 [ci skip] 2020-10-24 14:12:06 -05:00
GrayRachnid dc0b62879f Skip app execution aliases when searching for Python (#53569) (#13608)
Co-authored-by: Tad Hardesty <tad@platymuus.com>
2020-10-24 21:12:03 +02:00
Changelogs b90dd5477d Automatic changelog compile [ci skip] 2020-10-24 01:03:58 +00:00
Timothy Teakettle f17bf787e7 render antennas 2020-10-23 20:19:25 +01:00
CitadelStationBot fa8c3affd9 Automatic changelog generation for PR #13588 [ci skip] 2020-10-23 02:20:17 -05:00
silicons 61aee3be39 Merge pull request #13588 from Delams-The-SM/extra_emotes
Adding hiss, purr and meow emotes
2020-10-23 00:20:14 -07:00
Changelogs c76205b7ec Automatic changelog compile [ci skip] 2020-10-23 01:04:38 +00:00
CitadelStationBot dff0a12e44 Automatic changelog generation for PR #13606 [ci skip] 2020-10-22 01:24:26 -05:00
silicons c70f55d822 Merge pull request #13606 from Putnam3145/fix-admin-tab-deletus
fix statpanel deleting whole admin tab
2020-10-21 23:24:23 -07:00
Changelogs f9d9eff986 Automatic changelog compile [ci skip] 2020-10-22 01:04:03 +00:00
Timothy Teakettle f778ec0199 yeah lets maybe render stuff 2020-10-22 01:33:53 +01:00
timothyteakettle a9a4d00171 second qol 2020-10-22 00:08:33 +01:00
timothyteakettle 20854dd639 extra qol 2020-10-22 00:01:41 +01:00
timothyteakettle 4a3afae9d1 WHAT IF WE FIXED EVERYTHING IN ONE COMMIT 2020-10-21 23:59:15 +01:00
CitadelStationBot 483da2f5ed Automatic changelog generation for PR #13581 [ci skip] 2020-10-21 17:43:13 -05:00
silicons 231c5f0a9d Merge pull request #13581 from Ghommie/Ghommie-cit840
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
2020-10-21 15:43:09 -07:00
Putnam 84eba9bb88 fix statpanel deleting whole admin tab 2020-10-21 13:00:14 -07:00
Timothy Teakettle 06bbddd248 Update preferences_savefile.dm 2020-10-21 18:20:14 +01:00
Timothy Teakettle ab35f8cf66 include literally everything 2020-10-21 15:47:42 +01:00
Putnam3145 72082caaa4 Merge pull request #13596 from Citadel-Station-13/donatorvestshirt
Donator - Vest and Shirt
2020-10-20 20:14:16 -07:00
LetterJay 81d0eb5631 Update __donator.dm 2020-10-19 22:10:20 -05:00
Changelogs 8ad159aeac Automatic changelog compile [ci skip] 2020-10-20 01:02:20 +00:00
CitadelStationBot 8e72c61d2d Automatic changelog generation for PR #13587 [ci skip] 2020-10-19 16:33:13 -05:00
Putnam3145 9b5d7ab2a8 Merge pull request #13587 from Detective-Google/sex-taxi
the snow taxi is no longer the slow taxi
2020-10-19 14:33:09 -07:00