Commit Graph

23381 Commits

Author SHA1 Message Date
CitadelStationBot bddaafe7de Automatic changelog generation for PR #8932 [ci skip] 2019-09-02 18:23:49 -05:00
nik707 df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox
Adds a gun range to Box Station.
2019-09-02 18:23:48 -05:00
nik707 238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47
Increases click resolution to 0.5 seconds
2019-09-02 18:23:34 -05:00
CitadelStationBot 2f3bf39450 Automatic changelog generation for PR #9227 [ci skip] 2019-08-31 20:04:56 -05:00
nik707 bd60e00924 Merge pull request #9227 from Trilbyspaceclone/spritefiddles
Fixes missing peach and peach seed sprites
2019-08-31 20:04:54 -05:00
TrilbySpaceClone 98c268d6ac fix 2019-08-31 16:58:03 -04:00
CitadelStationBot 29967f0983 Automatic changelog generation for PR #9219 [ci skip] 2019-08-31 02:09:17 -05:00
nik707 e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
2019-08-31 02:09:15 -05:00
CitadelStationBot 2f980a9c91 Automatic changelog generation for PR #9175 [ci skip] 2019-08-31 02:06:35 -05:00
nik707 c826e1b412 Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
nik707 7e8e32f848 idiot 2019-08-31 02:05:13 -05:00
nik707 daff8899dd retard 2019-08-31 02:04:58 -05:00
nik707 1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79
improves an exploit patch
2019-08-31 01:48:20 -05:00
CitadelStationBot 0a7a875d39 Automatic changelog generation for PR #9216 [ci skip] 2019-08-31 01:37:52 -05:00
nik707 01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218
Fixes "Silver Core Luminescents Can Spawn "Oops" #9215"
2019-08-31 01:37:50 -05:00
lolman360 fee4209ec3 fffffffffffffffffffffffffffffffa 2019-08-31 10:16:03 +10:00
lolman360 c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00
lolman360 f2ed4c5085 Merge pull request #2 from lolman360/ddddddd
AAAAAAAAAAAAAAAAAAAAAAAAAAAA
2019-08-31 10:10:14 +10:00
lolman360 15cfcfc8c3 ffffffff 2019-08-31 10:09:37 +10:00
lolman360 689ba1246b eeeeee eeeeeee eeeeeeeeeeee 2019-08-31 10:08:31 +10:00
Trilbyspaceclone 9c9e1b1da3 Update life.dm 2019-08-30 09:24:58 -04:00
kevinz000 931527ff7c Update mob.dm 2019-08-29 22:54:41 -07:00
CitadelStationBot 0170c691da Automatic changelog generation for PR #9210 [ci skip] 2019-08-29 22:27:19 -05:00
nik707 45914b64d2 Merge pull request #9210 from EmeraldSundisk/dcdfix1
[SPEEDMERGE NOW I THINK] Delta Chapel Driver fixes
2019-08-29 22:27:17 -05:00
EmeraldSundisk 4f5e9893b3 Requested changes. 2019-08-29 19:32:32 -07:00
nik707 2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
2019-08-29 19:59:37 -05:00
nik707 1132b75392 Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76
Removes duplicate definition of games and toys nodes and readds autoylathe
2019-08-29 19:53:37 -05:00
Trilbyspaceclone c641874aab Update unsorted.dm 2019-08-29 20:50:36 -04:00
CitadelStationBot 07a731acc6 Automatic changelog generation for PR #9178 [ci skip] 2019-08-29 19:45:13 -05:00
nik707 dfdbb23d99 Merge pull request #9178 from deathride58/polyfix
fixes the poly tgs command not working at all
2019-08-29 19:45:11 -05:00
Raptorizer 4e9077aa2d aaaaaaa 2019-08-29 19:34:14 -05:00
CitadelStationBot eacdd931d0 Automatic changelog generation for PR #9200 [ci skip] 2019-08-29 19:34:11 -05:00
nik707 e7b267254b Merge pull request #9200 from Owai-Seek/minor-fixes
Fixes Strawberries
2019-08-29 19:34:09 -05:00
nik707 bff828d3be Merge pull request #9202 from Trilbyspaceclone/patch-216
Ports "Fixes wallets #510" From KeplerStation
2019-08-29 19:33:08 -05:00
CitadelStationBot 649dbf8627 Automatic changelog generation for PR #9204 [ci skip] 2019-08-29 19:31:42 -05:00
nik707 fccafd6bd9 Merge pull request #9204 from Trilbyspaceclone/patch-217
Fixes katana's being cursed when not cursed
2019-08-29 19:31:40 -05:00
Raptorizer 48f6b9408a Cotton/Durathread added? 2019-08-29 19:31:11 -05:00
nik707 01f732c57a Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
2019-08-29 19:29:14 -05:00
Raptorizer daf2ce5182 HHHHHH 2019-08-29 19:29:01 -05:00
CitadelStationBot c95492fcff Automatic changelog generation for PR #9208 [ci skip] 2019-08-29 19:28:04 -05:00
nik707 36a07f134b Merge pull request #9208 from Ghommie/Ghommie-cit190
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
Raptorizer a83f4f96bb Update seeds.dmi 2019-08-29 19:27:49 -05:00
Raptorizer 54cee2ff87 Conflict Resolve
Updated to include cotton/durathread
2019-08-29 19:26:46 -05:00
CitadelStationBot 8bb54bd8dd Automatic changelog generation for PR #9168 [ci skip] 2019-08-29 19:11:59 -05:00
nik707 624d717d08 Merge pull request #9168 from Seris02/loochotkey
Adds looc hotkey - on examination, just makes it better
2019-08-29 19:11:57 -05:00
CitadelStationBot aa6e3abaf6 Automatic changelog generation for PR #9172 [ci skip] 2019-08-29 19:11:20 -05:00
nik707 121c2c2f53 Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75
You rack the riot shotgun
2019-08-29 19:11:19 -05:00
nik707 fd2aec7efe Merge pull request #9171 from Citadel-Station-13/kevinz000-patch-74
Fixes and optimizes ghost swords
2019-08-29 19:09:40 -05:00
nik707 4f9b901a97 Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
Rebalances the MASONrig
2019-08-29 19:06:04 -05:00
CitadelStationBot 607ce2ae7f Automatic changelog generation for PR #9132 [ci skip] 2019-08-29 18:56:53 -05:00