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

39138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ghom
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
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
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
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
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
Timothy Teakettle
0db87ea5f8 better sprite 2020-10-21 22:04:07 +01:00
Putnam
84eba9bb88 fix statpanel deleting whole admin tab 2020-10-21 13:00:14 -07:00
Trilbyspaceclone
76a046b97a Update clothesmate.dm 2020-10-21 11:39:49 -04:00
Putnam3145
72082caaa4 Merge pull request #13596 from Citadel-Station-13/donatorvestshirt 
Donator - Vest and Shirt
 2020-10-20 20:14:16 -07:00
timothyteakettle
049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
kappa-sama
b3fc60c3f5 this too 2020-10-20 19:44:10 -04:00
kappa-sama
aa696edd84 this 2020-10-20 19:39:23 -04:00
Jordan Brown
132e747795 Fix adding new files 2020-10-20 14:27:31 -04:00
LetterJay
81d0eb5631 Update __donator.dm 2020-10-19 22:10:20 -05:00
Timothy Teakettle
4afceebcc1 critical 2020-10-20 02:11:08 +01: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