 Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
|
Trilbyspaceclone
|
c616c0e288
|
Update food_reagents.dm
|
2019-09-02 20:00:38 -04: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
|
dd7907c3d7
|
Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
|
2019-09-02 18:27:03 -05:00 |
|
|
Sishen
|
3f954f10a7
|
Update runes.dm
|
2019-09-02 02:09:59 -04:00 |
|
|
Trilbyspaceclone
|
473cde6a9d
|
huh
|
2019-08-31 21:16:14 -04:00 |
|
|
TrilbySpaceClone
|
c2f189bbdb
|
Merge branch 'master' into fruit
|
2019-08-31 21:09:59 -04:00 |
|
|
Ghommie
|
4085b479d1
|
Fixing clockie mass recall that I apparently didn't really fix before.
|
2019-09-01 01:45:33 +02:00 |
|
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
|
Sishen
|
279a6ed83e
|
bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths
|
2019-08-31 17:57:36 -04:00 |
|
|
Sishen
|
d9fff579b1
|
damage and stamina balances
|
2019-08-31 17:39:51 -04: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 |
|
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|
|
kappa-sama
|
db22ae64d4
|
im gonna go ape
|
2019-08-30 22:46:52 -04:00 |
|
|
kevinz000
|
64b29e9e1f
|
Update supermatter.dm
|
2019-08-30 15:22:58 -07:00 |
|
|
kevinz000
|
975b55e26d
|
Update singularity.dm
|
2019-08-30 15:19:30 -07:00 |
|
|
kevinz000
|
a3917a81b0
|
Update energy_ball.dm
|
2019-08-30 15:18:22 -07:00 |
|
|
kevinz000
|
bc74ce110a
|
Update energy_ball.dm
|
2019-08-30 15:17:23 -07:00 |
|
|
Sishen
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04: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 |
|
|
TrilbySpaceClone
|
ea7235d089
|
Merge branch 'master' into fruit
|
2019-08-29 21:15:18 -04:00 |
|
|
Trilbyspaceclone
|
1256d9382e
|
complie
|
2019-08-29 21:07:57 -04: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 |
|
|
nik707
|
e7b267254b
|
Merge pull request #9200 from Owai-Seek/minor-fixes
Fixes Strawberries
|
2019-08-29 19:34:09 -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
|
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 |
|
|
TrilbySpaceClone
|
d3852ebd56
|
even more
|
2019-08-29 19:39:10 -04: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 |
|
|
Sishen
|
47ee3a8a6d
|
fuck
|
2019-08-28 23:56:08 -04:00 |
|
|
Fermi
|
c1d9e3f03b
|
Failing is frustrating
|
2019-08-29 00:37:18 +01:00 |
|
|
Fermi
|
a5b8a56f9a
|
Realised it was impossible.
|
2019-08-29 00:32:05 +01:00 |
|
|
Fermi
|
5b144ef1c6
|
Removed unused var
|
2019-08-29 00:13:24 +01:00 |
|
|
Fermi
|
124d8503dc
|
Tests and fixes.
|
2019-08-29 00:12:16 +01: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 |
|