shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,267 Commits 5 Branches 0 Tags
fccfcf55e4907b5cccf05ff7bfa990cdf90d2ee4
Commit Graph

13267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
fccfcf55e4 Adds the saltmine shuttle. 2018-02-07 07:17:50 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369) 
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
 2018-02-07 07:17:50 -06:00
CitadelStationBot
d6f916f37b Automatic changelog generation for PR #5338 [ci skip] 2018-02-07 02:33:48 -06:00
LetterJay
85659b2975 Merge pull request #5338 from deathride58/widescreentoggle 
[Ready for speedmerge] Adds a button in the game options menu to toggle widescreen on/off
 2018-02-07 02:33:46 -06:00
deathride58
d236b75ca0 adds widescreen pref 2018-02-07 01:42:31 -05:00
LetterJay
52ed449741 Merge pull request #5010 from Citadel-Station-13/upstream-merge-34708 
[MIRROR] Switches database connector over to mariadb
 2018-02-06 23:21:56 -06:00
CitadelStationBot
f774a07833 Automatic changelog generation for PR #5269 [ci skip] 2018-02-06 19:08:11 -06:00
Michiyamenotehifunana
389e6de8f5 FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269) 
* FINALLY AFTER 2 MONTHS

WOOOOOOOOOOOOOOO

* Updates all polychromic code

This makes the default argument of all polychromic color input menus the last chosen color.
 2018-02-06 19:08:08 -06:00
CitadelStationBot
faf0c5f020 Automatic changelog generation for PR #5336 [ci skip] 2018-02-06 19:07:53 -06:00
Michiyamenotehifunana
6c18b55e67 Fixes the Mk.37F ejecting broken foam dart "casings" (#5336) 
* one pump chump

* 0 and 1 what is their point of intersection?
 2018-02-06 19:07:51 -06:00
CitadelStationBot
9a739bb6bd Automatic changelog generation for PR #5334 [ci skip] 2018-02-06 19:07:33 -06:00
theTiji0
2d06c71404 added space kiwis as a new simple mob (#5334) 
* added space kiwis as a new simple mob

* Fixed syntax typo

I hate everything
 2018-02-06 19:07:31 -06:00
CitadelStationBot
1c02892893 Automatic changelog generation for PR #5327 [ci skip] 2018-02-06 19:06:34 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
Poojawa
730580efeb Adds mentor tables 2018-02-06 16:07:09 -06:00
deathride58
380556dde4 Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156 
[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.
 2018-02-06 17:54:05 +00:00
deathride58
be33afbc97 Merge pull request #5335 from Citadel-Station-13/ventnerf 
[MIRROR] Nerfs Vent Clog
 2018-02-06 16:58:57 +00:00
CitadelStationBot
64eb7ee274 Automatic changelog generation for PR #5337 [ci skip] 2018-02-06 10:58:20 -06:00
deathride58
68712ca637 Merge pull request #5337 from Michiyamenotehifunana/cat-ears-for-cat-knights 
Makes Catknights Cats Again
 2018-02-06 16:58:17 +00:00
CitadelStationBot
2860b331d6 Automatic changelog generation for PR #5324 [ci skip] 2018-02-06 10:52:13 -06:00
deathride58
df48bdfcd9 Merge pull request #5324 from improvedname/cargonia-is-glorious! 
Adds disco ball to cargonia
 2018-02-06 16:52:10 +00:00
Poojawa
1d4e0d3511 Oops, copy paste fail 2018-02-06 09:56:36 -06:00
Poojawa
1bf0cdac64 Update slaughterevent.dm 2018-02-06 09:56:10 -06:00
Poojawa
35dcf5dce1 Update slaughter.dm 2018-02-06 09:50:12 -06:00
Poojawa
79cb10f8ec Update morph.dm 2018-02-06 09:49:46 -06:00
Michiyamenotehifunana
5a5b74c8d7 Fixes catknight ears 2018-02-06 22:31:23 +08:00
LetterJay
469abfd599 Update vent_clog.dm 2018-02-06 02:16:25 -06:00
Poojawa
4be9acea1d Snowdin pixel_x bugs 2018-02-05 21:39:21 -06:00
Poojawa
1cea674509 Update antag_spawner.dm 2018-02-05 21:35:15 -06:00
deathride58
0ecb7ad81b Merge branch 'master' into cargonia-is-glorious! 2018-02-06 02:54:58 +00:00
CitadelStationBot
d17ccace75 Automatic changelog generation for PR #5317 [ci skip] 2018-02-05 20:53:59 -06:00
deathride58
d5f703bc58 Merge pull request #5317 from improvedname/Loadout 
Organizes job spefific loadout stuff by departments
 2018-02-06 02:53:57 +00:00
CitadelStationBot
f8344cd6f5 Automatic changelog generation for PR #5316 [ci skip] 2018-02-05 20:53:26 -06:00
deathride58
a3649fc6fe Merge pull request #5316 from improvedname/Cargo 
Turns the kinkmate resupply crate into an construction kit
 2018-02-06 02:53:24 +00:00
CitadelStationBot
b4aca60ce1 Automatic changelog generation for PR #5307 [ci skip] 2018-02-05 20:51:56 -06:00
deathride58
9780fc64e3 Merge pull request #5307 from Michiyamenotehifunana/Medical-Turtleneck 
Adds the CMO's Turtleneck!
 2018-02-06 02:51:54 +00:00
CitadelStationBot
b5c92f7c1e Automatic changelog generation for PR #5332 [ci skip] 2018-02-05 20:48:54 -06:00
deathride58
0696c9eac5 Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324 
[MIRROR] Fix defibrillator mount runtiming continously while empty
 2018-02-06 02:48:52 +00:00
deathride58
cc78931f53 Merge pull request #5331 from Citadel-Station-13/upstream-merge-35368 
[MIRROR] Starts the reconquer of the changelog from the profane infidels
 2018-02-06 02:48:37 +00:00
deathride58
156fa1da1a Update antag_spawner.dm 2018-02-05 21:47:53 -05:00
deathride58
5357d4bd69 Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322 
[MIRROR] Adds missing wrapper for abductor roundend report.
 2018-02-06 02:46:05 +00:00
CitadelStationBot
6d466b25dd Automatic changelog generation for PR #5326 [ci skip] 2018-02-05 20:44:47 -06:00
deathride58
f593263a9d Merge pull request #5326 from Citadel-Station-13/upstream-merge-35295 
[MIRROR] Fix holorays staying if you switch holopads
 2018-02-06 02:44:45 +00:00
deathride58
3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316 
[MIRROR] Fixes comm message list for non-unique messages.
 2018-02-06 02:44:29 +00:00
CitadelStationBot
f072443a4c Automatic changelog generation for PR #5322 [ci skip] 2018-02-05 20:44:15 -06:00
deathride58
d29477f4a8 Merge pull request #5322 from Citadel-Station-13/upstream-merge-35305 
[MIRROR] Fixes crematorium on meta/box.
 2018-02-06 02:44:12 +00:00
CitadelStationBot
de1aad2b7c Automatic changelog generation for PR #5321 [ci skip] 2018-02-05 20:43:59 -06:00
deathride58
c9f7e7f14a Merge pull request #5321 from Citadel-Station-13/upstream-merge-35152 
[MIRROR] Rearranges mining vendor items and code, adds conscription kit
 2018-02-06 02:43:57 +00:00
CitadelStationBot
89c73c3e5f Automatic changelog generation for PR #5320 [ci skip] 2018-02-05 20:43:37 -06:00