Commit Graph
23286 Commits
Author SHA1 Message Date
Sishen d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04: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
Sishen b69c928419 FOR THE EMPEROR 2019-08-30 16:50:03 -04:00
nik707andGitHub 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
CitadelStationBot 5bd87fe72d Automatic changelog generation for PR #9186 [ci skip] 2019-08-28 00:02:41 -05:00
nik707andGitHub 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
CitadelStationBot 22aee03d30 Automatic changelog generation for PR #9180 [ci skip] 2019-08-27 22:51:01 -05:00
kevinz000andGitHub 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
CitadelStationBot 93cea3272e Automatic changelog generation for PR #8537 [ci skip] 2019-08-27 20:54:05 -05:00
BlackMajorandGitHub 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
CitadelStationBot 28f91949de Automatic changelog generation for PR #9177 [ci skip] 2019-08-26 21:42:17 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 78c1ad972f Merge pull request #9179 from chefferz/master
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
CitadelStationBot dd54cc9e7d Automatic changelog generation for PR #9194 [ci skip] 2019-08-26 21:37:29 -05:00
kevinz000andGitHub 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
CitadelStationBot ade3f2f847 Automatic changelog generation for PR #9169 [ci skip] 2019-08-26 21:37:19 -05:00
kevinz000andGitHub d696c2cf6b Merge pull request #9169 from EmeraldSundisk/delta2chapel
Adds a holy driver to Delta Station.
2019-08-26 19:37:17 -07:00
CitadelStationBot 249258a8ac Automatic changelog generation for PR #9183 [ci skip] 2019-08-26 21:36:08 -05:00
kevinz000andGitHub 96278b45ad Merge pull request #9183 from Ghommie/Ghommie-cit187
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000andGitHub c069e76304 Merge pull request #9181 from Linzolle/general-swordsky
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
deathride58andGitHub 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
kevinz000andGitHub d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07:00
deathride58andGitHub 89f8578a35 Merge pull request #9195 from Sishen1542/bzoinks
[s] fixes BZ research exploit
2019-08-25 18:58:19 -04:00
Sishen b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04:00
kappa-samaandGitHub 036115eddb wallets can hold keys 2019-08-25 15:45:47 -04:00
kappa-samaandGitHub ed471480de Merge pull request #5 from Citadel-Station-13/master
merge master to master
2019-08-25 15:43:56 -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
chefferzandGitHub 3fcf9b329f Update his_grace.dm 2019-08-23 21:46:04 -04:00
Sishen 05a8c3bb20 aaaaaaa 2019-08-23 14:47:19 -04:00
Sishen 3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
Ghommie 106cd7b845 Fixes "Blood Cult Conversion Prompt Issues" 2019-08-23 19:38:39 +02:00
chefferzandGitHub 0f4f20c29a Update buffs.dm 2019-08-23 03:50:28 -04:00
chefferzandGitHub 788d616c76 Update his_grace.dm 2019-08-23 03:47:21 -04:00
chefferzandGitHub bd1dae9082 Update buffs.dm 2019-08-23 03:46:13 -04:00
chefferzandGitHub 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
chefferzandGitHub 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
chefferzandGitHub 2e37ca390a Merge pull request #1 from chefferz/chefferz-balance1
Gives His Grace stamina regeneration
2019-08-22 20:16:42 -04:00
chefferzandGitHub 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
kevinz000andGitHub 62e931c62d Merge pull request #9174 from deathride58/fuckprinters
[S] fixes major href exploit
2019-08-22 03:11:10 -07:00
deathride58 ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04:00
CitadelStationBot 8195fb84d3 Automatic changelog generation for PR #9164 [ci skip] 2019-08-21 10:17:41 -05:00
deathride58andGitHub fc2fdf71ca Merge pull request #9164 from lolman360/sprites
lolman fucks up his first pr
2019-08-21 11:17:39 -04:00
CitadelStationBot b8615e8659 Automatic changelog generation for PR #8968 [ci skip] 2019-08-21 10:16:08 -05:00
kevinz000andGitHub 25a7d3af51 Merge pull request #8968 from Trilbyspaceclone/patch-199
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
CitadelStationBot 8bec3bc705 Automatic changelog generation for PR #9145 [ci skip] 2019-08-21 10:15:11 -05:00
kevinz000andGitHub ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
2019-08-21 08:15:08 -07:00