 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 |
|
|
TrilbySpaceClone
|
71aeddd6f6
|
Packbrakeout
|
2019-09-02 11:17:55 -04:00 |
|
|
Sishen
|
3f954f10a7
|
Update runes.dm
|
2019-09-02 02:09:59 -04:00 |
|
|
Sishen
|
0b6eb6e34c
|
Update holy_weapons.dm
|
2019-09-01 22:36:39 -04:00 |
|
|
Ghommie
|
36ffd3d6a8
|
More lines.
|
2019-09-01 03:35:36 +02: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
|
db3c36fd9a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-09-01 01:59:00 +02: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 |
|
|
TrilbySpaceClone
|
36695d556f
|
Lets have all the ammo and kegs together
|
2019-08-31 15:38:26 -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 |
|
|
nik707
|
7e8e32f848
|
idiot
|
2019-08-31 02:05:13 -05:00 |
|
|
nik707
|
daff8899dd
|
retard
|
2019-08-31 02:04:58 -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 |
|
|
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 |
|
|
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 |
|
|
Poojawa
|
6b5388951f
|
Ohwait let's not return on a normal process. :^)
|
2019-08-30 03:16:18 -05:00 |
|
|
Poojawa
|
2849f82d0b
|
let's be sure people don't have negative bleeding, because that would be weird as fuck.
|
2019-08-30 03:15:46 -05:00 |
|
|
Poojawa
|
b2252a1c74
|
Medical assistance treats bleed_rate to stop phantom bleeding
|
2019-08-30 02:46:57 -05:00 |
|
|
kevinz000
|
931527ff7c
|
Update mob.dm
|
2019-08-29 22:54:41 -07:00 |
|
|
Poojawa
|
dae3e91293
|
MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS
|
2019-08-30 00:07:06 -05:00 |
|
|
Poojawa
|
dca90db321
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-29 23:03:26 -05:00 |
|
|
Poojawa
|
a0412933c0
|
Blood Generator QOL, put in hands, select slot to add bloodbag to
|
2019-08-29 23:02:41 -05: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 |
|
|
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 |
|