Alonefromhell
|
eee1ccbe2c
|
merge oracle ui from kepler
|
2019-09-04 11:42:04 -05:00 |
|
YakumoChen
|
807f7f4771
|
completely removes autoscan as originally intended
|
2019-09-03 06:03:46 +00:00 |
|
YakumoChen
|
fbcce02f78
|
still removes autoscan
|
2019-09-03 05:44:51 +00:00 |
|
nik707
|
44c15897c7
|
Merge pull request #9209 from Sishen1542/ass-ass-ass
Adds support for trit, bz, and pluox to the SM
|
2019-09-02 18:37:42 -05:00 |
|
nik707
|
2fe5571887
|
Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
|
2019-09-02 18:37:22 -05:00 |
|
nik707
|
67f4276aab
|
Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
|
2019-09-02 18:35:56 -05:00 |
|
nik707
|
ca8166f940
|
Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68
Buffs cult/clockcult wall explosion_block
|
2019-09-02 18:28:05 -05:00 |
|
nik707
|
dd7907c3d7
|
Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
|
2019-09-02 18:27:03 -05:00 |
|
nik707
|
3ea520d443
|
Merge pull request #8649 from Ghommie/Ghommie-cit50
Increases the default space ruin z-level count to 2
|
2019-09-02 18:25:30 -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 |
|
nik707
|
e943cf0ae8
|
Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
|
2019-08-31 02:09:15 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
nik707
|
01f732c57a
|
Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
|
2019-08-29 19:29:14 -05:00 |
|
nik707
|
36a07f134b
|
Merge pull request #9208 from Ghommie/Ghommie-cit190
Socks uncolorability fix.
|
2019-08-29 19:28:01 -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 |
|
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 |
|
nik707
|
bfd17d66cd
|
Merge pull request #9074 from Citadel-Station-13/donator_grouping
Donator grouping system
|
2019-08-29 18:31:23 -05:00 |
|
nik707
|
2f7402f591
|
Merge pull request #9184 from Ghommie/Ghommie-cit188
Removes an obnoxious temporary overlay var.
|
2019-08-29 18:19:44 -05:00 |
|
Sishen
|
07a2d19c34
|
Update supermatter.dm
|
2019-08-28 23:58:27 -04:00 |
|
Dap
|
19678119c5
|
Merge branch 'plasmatables' into plasmaglass-tables-spears
|
2019-08-28 14:55:01 -06:00 |
|
nik707
|
9a0b6a21f9
|
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
Amber alert ERTs no longer get pulse weapons
|
2019-08-28 13:05:56 -05:00 |
|
Sishen
|
c664032e85
|
Update supermatter.dm
|
2019-08-28 02:23:24 -04:00 |
|
nik707
|
8e40e9d887
|
Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
|
2019-08-28 00:02:39 -05:00 |
|
kevinz000
|
bea4349056
|
Merge pull request #9180 from deathride58/buffspoly
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
|
2019-08-27 20:50:59 -07:00 |
|
Ghommie
|
0ffeb704af
|
Socks color fix.
|
2019-08-28 05:33:36 +02:00 |
|
Ghommie
|
18b023b127
|
arg
|
2019-08-28 04:47:53 +02:00 |
|
BlackMajor
|
4d6b9f5da1
|
Merge pull request #8537 from Ghommie/Ghommie-cit28
Fixes emags wasting charges on un-emaggable stuff.
|
2019-08-28 13:54:03 +12:00 |
|
Ghommie
|
e25697dc14
|
rocket fix.
|
2019-08-28 03:37:35 +02:00 |
|
Trilbyspaceclone
|
6cf4783486
|
fixed
|
2019-08-27 13:56:47 -04:00 |
|
Trilbyspaceclone
|
77863119f2
|
Update wallets.dm
|
2019-08-27 11:31:52 -04:00 |
|
Winter Flare
|
26c5aa6185
|
Update berries.dm
Actually fixes strawberries so they have visible growth stages and death icons.
|
2019-08-27 03:47:56 -04:00 |
|
kevinz000
|
f07cdc0665
|
Merge pull request #9177 from JTGSZ/fix
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
|
2019-08-26 19:42:15 -07:00 |
|
kevinz000
|
78c1ad972f
|
Merge pull request #9179 from chefferz/master
Gives His Grace stamina regeneration
|
2019-08-26 19:39:46 -07:00 |
|
kevinz000
|
37642cdac2
|
Merge pull request #9194 from kappa-sama/kappa-sama-keys
Wallets can now hold vehicle keys.
|
2019-08-26 19:37:28 -07:00 |
|
kevinz000
|
96278b45ad
|
Merge pull request #9183 from Ghommie/Ghommie-cit187
Fixes "Blood Cult Conversion Prompt Issues"
|
2019-08-26 19:36:06 -07:00 |
|
kevinz000
|
c069e76304
|
Merge pull request #9181 from Linzolle/general-swordsky
[SPEEDMERGE] fixes sword exploit and secbot construction
|
2019-08-26 19:35:51 -07:00 |
|