nik707 and GitHub
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 and GitHub
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
kevinz000 and GitHub
931527ff7c
Update mob.dm
2019-08-29 22:54:41 -07:00
nik707 and GitHub
2307f7a2a6
Merge pull request #9146 from Raptorizer/Botany-Peaches
...
New plant type: Peaches
2019-08-29 19:59:37 -05:00
nik707 and GitHub
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 and GitHub
c641874aab
Update unsorted.dm
2019-08-29 20:50:36 -04:00
nik707 and GitHub
e7b267254b
Merge pull request #9200 from Owai-Seek/minor-fixes
...
Fixes Strawberries
2019-08-29 19:34:09 -05:00
nik707 and GitHub
bff828d3be
Merge pull request #9202 from Trilbyspaceclone/patch-216
...
Ports "Fixes wallets #510 " From KeplerStation
2019-08-29 19:33:08 -05:00
nik707 and GitHub
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 and GitHub
01f732c57a
Merge pull request #9207 from Ghommie/Ghommie-cit189
...
Rawket lawnchair fix.
2019-08-29 19:29:14 -05:00
nik707 and GitHub
36a07f134b
Merge pull request #9208 from Ghommie/Ghommie-cit190
...
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
nik707 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
4f9b901a97
Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
...
Rebalances the MASONrig
2019-08-29 19:06:04 -05:00
nik707 and GitHub
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
nik707 and GitHub
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
nik707 and GitHub
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
nik707 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
6cf4783486
fixed
2019-08-27 13:56:47 -04:00
Trilbyspaceclone and GitHub
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 and GitHub
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 and GitHub
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
kevinz000 and GitHub
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 and GitHub
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000 and GitHub
c069e76304
Merge pull request #9181 from Linzolle/general-swordsky
...
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
kevinz000 and GitHub
d64e5b29fd
Update reactions.dm
2019-08-25 15:59:45 -07:00
Sishen
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
kappa-sama and GitHub
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
chefferz and GitHub
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
Ghommie
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
Ghommie
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
chefferz and GitHub
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
chefferz and GitHub
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
chefferz and GitHub
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
chefferz and GitHub
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
Linzolle
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
chefferz and GitHub
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
deathride58
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
chefferz and GitHub
dca81de36c
Gives His Grace stamina regeneration
...
His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten.
This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion.
2019-08-22 20:09:52 -04:00
JTGSZ
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00