shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,167 Commits 5 Branches 0 Tags
bfaaecde490a971aed36cffb36691e430d5ac3f7
Commit Graph

39167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Putnam
bfaaecde49 whoops more sanity checking 2020-11-17 02:42:49 -08:00
Putnam
30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
Putnam
43d4ad8c12 More testing and such. It's super slow now! 2020-11-10 20:04:32 -08:00
Putnam
ff1a1aa8ae Updated to latest attempts. Oy. 2020-11-09 18:56:02 -08:00
Putnam
8f7c821f3a Made turf processing stop if overtime. 2020-11-01 04:07:28 -08:00
Putnam
90e3be2a12 auxtools atmos works now 2020-10-31 02:55:31 -07:00
Putnam
46c4c347f9 giasfclfubrehber 2020-10-30 01:52:26 -07:00
Putnam
3c4eff605d broken but compiles and runs sans panics 2020-10-28 23:07:59 -07:00
silicons
453d5081a7 Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint 
Adjusting Boxstation's Southeast Maint (three new rooms)
 2020-10-28 07:54:04 -07:00
CitadelStationBot
bcc9c4ef17 Automatic changelog generation for PR #13626 [ci skip] 2020-10-28 09:53:48 -05:00
silicons
1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
CitadelStationBot
54a878df1e Automatic changelog generation for PR #13627 [ci skip] 2020-10-28 09:53:26 -05:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons
2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
CitadelStationBot
bd13c6f1d9 Automatic changelog generation for PR #13616 [ci skip] 2020-10-28 09:49:42 -05:00
silicons
598c2fab2b Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1 
Quick clown/mime masks designs fix.
 2020-10-28 07:49:38 -07:00
CitadelStationBot
fe2de56661 Automatic changelog generation for PR #13612 [ci skip] 2020-10-28 09:47:28 -05:00
silicons
2827893950 Merge pull request #13612 from MrJWhit/hermit-expansion 
Space Hermit map buff
 2020-10-28 07:47:24 -07:00
CitadelStationBot
720ee01f8c Automatic changelog generation for PR #13607 [ci skip] 2020-10-28 09:46:59 -05:00
silicons
5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid 
polychromic maid outfit
 2020-10-28 07:46:55 -07:00
CitadelStationBot
41dbfa8476 Automatic changelog generation for PR #13605 [ci skip] 2020-10-28 09:46:28 -05:00
silicons
f2747a3b1c Merge pull request #13605 from Trilbyspaceclone/patch-403 
Adds corporate uniforms to the clothing vender
 2020-10-28 07:46:24 -07:00
CitadelStationBot
ab3ff76022 Automatic changelog generation for PR #13603 [ci skip] 2020-10-28 09:44:05 -05:00
silicons
1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43 
controversial shotgun buff (very scary)
 2020-10-28 07:44:02 -07:00
CitadelStationBot
1de7408203 Automatic changelog generation for PR #13601 [ci skip] 2020-10-28 09:43:43 -05:00
silicons
6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
silicons
ac4e82cbc7 Merge pull request #13569 from Cyberboss/patch-4 
Adds automatic TGS DMAPI updates
 2020-10-28 07:42:36 -07:00
CitadelStationBot
8de3cdbf28 Automatic changelog generation for PR #13592 [ci skip] 2020-10-28 09:41:47 -05:00
silicons
e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
CitadelStationBot
a807c21967 Automatic changelog generation for PR #13593 [ci skip] 2020-10-28 09:41:39 -05:00
silicons
a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07:00
MrJWhit
5806ea8f50 Even cooler.jpg 2020-10-26 20:39:20 -04:00
MrJWhit
5da37ddeb2 Minor fix 2020-10-26 18:57:06 -04: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
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
zeroisthebiggay
626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00
zeroisthebiggay
2c278ba370 A 
A
 2020-10-25 05:34:53 -04:00
zeroisthebiggay
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