Commit Graph
39316 Commits
Author SHA1 Message Date
SiliconMainandGitHub 1f46248c2c Update mask.dm 2020-10-28 09:27:59 -05:00
Hatterhat a4196e567b i told me there'd be balance issues 2020-10-27 22:35:27 -05:00
Dip fb895cd5df ahem, icon state. 2020-10-27 16:53:21 -03:00
Dip bba5579369 why is this on the wrong layer? 2020-10-27 16:34:08 -03:00
MrJWhit 5806ea8f50 Even cooler.jpg 2020-10-26 20:39:20 -04:00
timothyteakettle 2275dde281 prior fix didnt work this does 2020-10-27 00:15:58 +00:00
timothyteakettle 79e81a455a old fix 2020-10-26 23:52:20 +00:00
MrJWhit 5da37ddeb2 Minor fix 2020-10-26 18:57:06 -04:00
Timothy Teakettle e22bf8cf35 config 2020-10-26 20:46:40 +00:00
Timothy Teakettle 78e3eb14f9 another typo 2020-10-26 20:42:22 +00:00
Timothy Teakettle 0fa83322a1 re-add slow stride but it defaults to disabled 2020-10-26 20:40:11 +00:00
Timothy Teakettle f468e4940a typo 2020-10-26 20:33:46 +00:00
Timothy Teakettle 4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle 2b00f2bb2f config values 2020-10-26 20:27:02 +00:00
Timothy Teakettle 38313fa362 i hate dwarves 2020-10-26 17:50:21 +00:00
Timothy Teakettle cfefe99d35 okay so what if its not quirks 2020-10-26 17:45:43 +00:00
MrJWhit 65f82daa44 Update BoxStation.dmm 2020-10-25 17:59:53 -04:00
MrJWhit 1e65afda9d Update BoxStation.dmm 2020-10-25 17:58:00 -04:00
MrJWhit c540bcd0f2 Secret botany 2020-10-25 17:54:02 -04:00
MrJWhit 33cfcc72be Making box maint cooler, bot party room and maint rage cage part 1 2020-10-25 14:31:43 -04:00
Ghommie 444a440fba oh 2020-10-25 15:38:36 +01:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
CitadelStationBot e3136eb834 Automatic changelog generation for PR #13611 [ci skip] 2020-10-25 08:15:05 -05:00
MrJWhitandGitHub 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
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-SMandGitHub 52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
zeroisthebiggayandGitHub 626fcf0aeb OOPS
FUCK
2020-10-25 05:36:59 -04:00
zeroisthebiggayandGitHub 2c278ba370 A
A
2020-10-25 05:34:53 -04:00
zeroisthebiggayandGitHub 5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE
OK
2020-10-25 05:34:24 -04:00
zerothebigboy 6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
Letter NandGitHub 3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
LetterJayandGitHub 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
ArturlangandGitHub 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
siliconsandGitHub 585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
siliconsandGitHub 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
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
bb155f8784 Apply suggestions from code review
Grammar

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2020-10-24 07:25:27 -04:00
Vynzill fdb0f65c53 quickfix 2020-10-23 15:18:18 -05:00
Vynzill ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
GhomandGitHub 5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02:00
CitadelStationBot fa8c3affd9 Automatic changelog generation for PR #13588 [ci skip] 2020-10-23 02:20:17 -05:00
siliconsandGitHub 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
MrJWhit 65fa7e72bf Removing fire locker and adding a maint spawner instead 2020-10-22 18:52:16 -04:00
MrJWhit 504447f3ae Space Hermit buff 2020-10-22 15:23:33 -04:00
CitadelStationBot dff0a12e44 Automatic changelog generation for PR #13606 [ci skip] 2020-10-22 01:24:26 -05:00