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

13297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
e7fa382cd4 Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374 
[MIRROR] Fix pressure damage not taking effect properly
 2018-02-07 19:09:52 +00:00
CitadelStationBot
9865fec9f8 Automatic changelog generation for PR #5347 [ci skip] 2018-02-07 13:08:29 -06:00
deathride58
830b33da59 Merge pull request #5347 from Citadel-Station-13/upstream-merge-35360 
[MIRROR] Removes synths and androids from magic mirror
 2018-02-07 19:08:27 +00:00
CitadelStationBot
778ff7889a Automatic changelog generation for PR #5346 [ci skip] 2018-02-07 13:08:11 -06:00
deathride58
41bacce125 Merge pull request #5346 from Citadel-Station-13/upstream-merge-35356 
[MIRROR] Makes the posibrain play a ping sound on success.
 2018-02-07 19:08:09 +00:00
deathride58
7736dddcf6 Merge pull request #5345 from Citadel-Station-13/upstream-merge-35371 
[MIRROR] doppler arrays no longer runtime when processing < 5/10/20 bombs
 2018-02-07 19:07:53 +00:00
CitadelStationBot
3da6459362 Automatic changelog generation for PR #5344 [ci skip] 2018-02-07 13:07:41 -06:00
deathride58
4600ace2bd Merge pull request #5344 from Citadel-Station-13/upstream-merge-35363 
[MIRROR] Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 19:07:39 +00:00
CitadelStationBot
df02631dc4 Automatic changelog generation for PR #5343 [ci skip] 2018-02-07 13:07:26 -06:00
deathride58
1e0155d1c8 Merge pull request #5343 from Citadel-Station-13/upstream-merge-35353 
[MIRROR] Reduced shards and shells for the cult
 2018-02-07 19:07:24 +00:00
CitadelStationBot
e63c61ab59 Automatic changelog generation for PR #5342 [ci skip] 2018-02-07 13:07:04 -06:00
deathride58
2732823a68 Merge pull request #5342 from Citadel-Station-13/upstream-merge-35277 
[MIRROR] Forces gases to obey certain laws of nature
 2018-02-07 19:07:01 +00:00
deathride58
65a470611d Merge pull request #5341 from Citadel-Station-13/upstream-merge-35361 
[MIRROR] Re-enables space runes on Station Z-Level
 2018-02-07 19:06:12 +00:00
deathride58
3819e8088b Merge pull request #5340 from Citadel-Station-13/upstream-merge-35212 
[MIRROR] Squashes silicon HUDs together
 2018-02-07 19:05:56 +00:00
CitadelStationBot
7e09c3ff65 Fix pressure damage not taking effect properly 2018-02-07 04:56:44 -06:00
vuonojenmustaturska
9bb3ce1931 Merge pull request #35374 from AutomaticFrenzy/patch/pressure 
Fix pressure damage not taking effect properly
 2018-02-07 04:56:44 -06:00
CitadelStationBot
5c297eff77 Removes synths and androids from magic mirror 2018-02-07 04:42:01 -06:00
vuonojenmustaturska
ca5f5f6f1f Merge pull request #35360 from Robustin/blackmirror 
Removes synths and androids from magic mirror
 2018-02-07 04:42:01 -06:00
CitadelStationBot
bcacd9859b Makes the posibrain play a ping sound on success. 2018-02-07 04:41:52 -06:00
vuonojenmustaturska
23843241b4 Merge pull request #35356 from DaxDupont/chime 
Makes the posibrain play a ping sound on success.
 2018-02-07 04:41:52 -06:00
CitadelStationBot
e02c6a31cf doppler arrays no longer runtime when processing < 5/10/20 bombs 2018-02-07 04:39:33 -06:00
vuonojenmustaturska
a93f9509fc Merge pull request #35371 from kevinz000/patch-444 
doppler arrays no longer runtime when processing < 5/10/20 bombs
 2018-02-07 04:39:33 -06:00
CitadelStationBot
afbaf770ee Kills tactical brass chairs; alternatively, "this is why we can't have nice things" 2018-02-07 04:39:21 -06:00
vuonojenmustaturska
192e548bb3 Merge pull request #35363 from Xhuis/chair_nerf 
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 04:39:21 -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
CitadelStationBot
8bc286cefb Reduced shards and shells for the cult 2018-02-07 02:32:39 -06:00
vuonojenmustaturska
5be63dbaab Merge pull request #35353 from Robustin/constructlimit 
Reduced shards and shells for the cult
 2018-02-07 02:32:39 -06:00
CitadelStationBot
80a909314f Forces gases to obey certain laws of nature 2018-02-07 02:32:31 -06:00
BordListian
9b910552fd Forces gases to obey certain laws of nature (#35277) 
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
 2018-02-07 02:32:31 -06:00
CitadelStationBot
ef89606f43 Re-enables space runes on Station Z-Level 2018-02-07 02:32:22 -06:00
Robustin
6db2219f20 Reverts oysters (#35361) 2018-02-07 02:32:22 -06:00
CitadelStationBot
47751a97fa Squashes silicon HUDs together 2018-02-07 02:32:14 -06:00
Slignerd
afcdb771b3 Squashes silicon HUDs together (#35212) 
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
 2018-02-07 02:32:14 -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