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
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
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
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
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
kevinz000
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
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
kevinz000
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
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000
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
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
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
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
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
chefferz
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
chefferz
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
chefferz
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
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
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
deathride58
ea9eaedf1a
Ports BeeStation/BeeStation-Hornet#345
2019-08-21 22:16:44 -04:00
kevinz000
2f9ca28d38
this is bad performance and probably unnecessary but juuust in case..
2019-08-21 08:17:34 -07:00
kevinz000
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
kevinz000
ba2a6d6626
Merge pull request #9145 from Trilbyspaceclone/patch-212
...
gives drones a RPD
2019-08-21 08:15:08 -07:00
kevinz000
7fe2d2b5f2
Merge pull request #9142 from Trilbyspaceclone/patch-211
...
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
kevinz000
3c59b43ff7
Update shotgun.dm
2019-08-21 06:39:18 -07:00
kevinz000
2f39bb3d56
Update necropolis_chests.dm
2019-08-20 21:59:50 -07:00
kevinz000
c694248f5a
Update necropolis_chests.dm
2019-08-20 21:58:48 -07:00
Sishen
7a8e2c3f50
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
2019-08-19 17:54:16 -04:00
Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
Trilbyspaceclone
d1404a84d8
Update backpack.dm
2019-08-19 07:03:54 -04:00
BlackMajor
dbe50db261
Merge pull request #8349 from Trilbyspaceclone/patch-124
...
Removes Nitryl bounty but adds 7 more in!
2019-08-19 20:07:40 +12:00
kevinz000
1ab64d4003
Update ert.dm
2019-08-18 23:43:31 -07:00
kevinz000
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
kevinz000
3f734d9aca
Merge pull request #8763 from Trilbyspaceclone/patch-188
...
Reblances bone satchles
2019-08-18 23:39:39 -07:00
kevinz000
47dd8d22eb
Merge pull request #9149 from Trilbyspaceclone/padding_and_such
...
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
2019-08-18 23:37:56 -07:00
kevinz000
3ef29bbbeb
Merge pull request #9097 from lolman360/durathread
...
Adds durathread.
2019-08-18 23:37:07 -07:00
kevinz000
8a96b29ef9
Merge pull request #9137 from Sishen1542/the-d-boiz
...
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
