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
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
4f9b901a97
Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
...
Rebalances the MASONrig
2019-08-29 19:06:04 -05:00
607ce2ae7f
Automatic changelog generation for PR #9132 [ci skip]
2019-08-29 18:56:53 -05:00
d2bb75c820
Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered
...
Toricrates: Remastered: Complete Edition 2019
2019-08-29 18:56:51 -05:00
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
6a24d1fdc4
Automatic changelog generation for PR #9080 [ci skip]
2019-08-29 18:23:49 -05:00
0a4090f4d3
Merge pull request #9080 from Thalpy/Newmusic
...
Adds 3 new Copyright compatible space-y music tracks to title
2019-08-29 18:23:47 -05:00
55fbc7eb95
Automatic changelog generation for PR #9184 [ci skip]
2019-08-29 18:19:46 -05:00
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
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
5bd87fe72d
Automatic changelog generation for PR #9186 [ci skip]
2019-08-28 00:02:41 -05:00
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
22aee03d30
Automatic changelog generation for PR #9180 [ci skip]
2019-08-27 22:51:01 -05:00
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
93cea3272e
Automatic changelog generation for PR #8537 [ci skip]
2019-08-27 20:54:05 -05:00
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
28f91949de
Automatic changelog generation for PR #9177 [ci skip]
2019-08-26 21:42:17 -05:00
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
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
dd54cc9e7d
Automatic changelog generation for PR #9194 [ci skip]
2019-08-26 21:37:29 -05:00
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
ade3f2f847
Automatic changelog generation for PR #9169 [ci skip]
2019-08-26 21:37:19 -05:00
d696c2cf6b
Merge pull request #9169 from EmeraldSundisk/delta2chapel
...
Adds a holy driver to Delta Station.
2019-08-26 19:37:17 -07:00
249258a8ac
Automatic changelog generation for PR #9183 [ci skip]
2019-08-26 21:36:08 -05:00
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
c069e76304
Merge pull request #9181 from Linzolle/general-swordsky
...
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
3a31785dee
Merge pull request #9196 from Citadel-Station-13/kevinz000-patch-78
...
sishen broke master (or i did by not doing my job right)
2019-08-25 19:51:00 -04:00
d64e5b29fd
Update reactions.dm
2019-08-25 15:59:45 -07:00
89f8578a35
Merge pull request #9195 from Sishen1542/bzoinks
...
[s] fixes BZ research exploit
2019-08-25 18:58:19 -04:00
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
ed471480de
Merge pull request #5 from Citadel-Station-13/master
...
merge master to master
2019-08-25 15:43:56 -04:00
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
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
05a8c3bb20
aaaaaaa
2019-08-23 14:47:19 -04:00
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
2e37ca390a
Merge pull request #1 from chefferz/chefferz-balance1
...
Gives His Grace stamina regeneration
2019-08-22 20:16:42 -04:00
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
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
nik707