5500e349e3
Merge branch 'master' into kevinz000-patch-10
2020-01-20 21:48:28 +01:00
9ea6e896fb
Kevinz, please.
2020-01-20 21:43:00 +01:00
cd48f1a152
forcewall
2020-01-20 14:22:23 -06:00
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
28a6e6eccf
Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this
...
.357 AP printable from illegal ballistics
2020-01-20 18:50:25 +01:00
815b4f033d
made flavor things a game option + more hoard
2020-01-20 04:13:54 -08:00
8b21a60ac9
MF Line endings
2020-01-20 14:09:22 +02:00
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
8e674817a9
errors
2020-01-20 00:30:18 -08:00
ab771d9505
I deleted an important thing
2020-01-20 15:48:55 +08:00
a100f9382e
better, there, happy now github
2020-01-20 14:51:53 +08:00
593e626233
Merge pull request #10346 from deathride58/limbstamlossnerf
...
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
2020-01-19 23:11:02 -07:00
28a2cc4a3d
.357 AP printable from illegal ballistics
2020-01-19 23:55:12 -06:00
46376904e0
extra line
2020-01-19 22:35:46 -07:00
a99406b46a
oh fucking boy
2020-01-19 22:33:16 -07:00
5524b0fa03
yes.
2020-01-20 13:00:24 +08:00
06c66617e6
m o r e traitor objectives
2020-01-19 18:58:10 -08:00
9b9c7c3018
exo nerf
2020-01-19 20:37:31 -06:00
afd848e45a
weh
2020-01-20 10:29:09 +08:00
77911f9009
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
...
Ghost role eligibility activation in player panel
2020-01-20 03:24:46 +01:00
8a091c5140
Merge pull request #10614 from Putnam3145/suicide_option
...
Made suicide a config flag
2020-01-20 03:24:00 +01:00
56e58e5c5e
whoops
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-19 18:14:33 -08:00
16f9c1bf78
feedback, EORG allowed
2020-01-19 18:01:21 -08:00
65eaf9787a
Merge pull request #10097 from Ghommie/Ghommie-cit444
...
Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
088e586b47
Merge pull request #9601 from Ghommie/Ghommie-cit265
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
0b0a6429ea
Update pyrotechnics.dm
2020-01-19 13:31:11 -07:00
c273853cff
Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks
2020-01-19 15:25:23 -05:00
cf9d3977b8
Reward Fix
2020-01-19 15:25:20 -05:00
cf9c3a65fd
Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
...
Adds bloodsucker antagonist bans
2020-01-19 16:38:45 +01:00
536900a7ac
Merge pull request #10520 from Hatterhat/tg-40920
...
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
812182230f
Merge pull request #10307 from Seris02/stunglasses
...
stunglasses
2020-01-19 16:35:47 +01:00
4a0c85e0c0
Merge pull request #10594 from chefferz/chefferz-abductor1
...
Removes shrink rays from abductor console.
2020-01-19 16:12:51 +01:00
1bdb515592
made suicide a config flag
2020-01-19 03:44:45 -08:00
bb6fac4390
I shall actually compile it this time
2020-01-19 17:01:51 +08:00
bc5646f8b1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
2020-01-19 00:56:17 -08:00
0ea3e275e3
yep
2020-01-19 16:54:46 +08:00
45b844c231
more fixes + code improvements
2020-01-19 16:48:19 +08:00
afe7c15645
merge fixes
2020-01-19 16:40:45 +08:00
25d7af31a5
merge fixes
2020-01-19 16:36:04 +08:00
1ee7885392
re:woops
2020-01-19 16:28:12 +08:00
47d1f46172
fixes and stuff
2020-01-19 15:53:32 +08:00
f54417f99e
fixes
2020-01-19 15:50:48 +08:00
5eba760aa8
Reworked survivalist
2020-01-18 22:07:54 -08:00
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
e1cf63e0ac
Greentext tweaked
2020-01-18 21:32:42 -08:00
d287835d14
Made quirk blacklisting antag-sided
2020-01-18 21:29:27 -08:00
5d4732ed30
Update assistant.dm
2020-01-18 22:36:20 -05:00
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -05:00
2b3f00ed1e
Fix Freezer overlay bug
2020-01-18 22:16:43 -05:00
bd30b44919
Bounty Reorganisation and Rebalance
...
Reorganises several bounties.
Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others.
Moves:
Khinkali to Chef Bounties
Super Bite to Chef Bounties
Poppy Pretzels to Chef Bounties
Adds:
Fiesta Skewer Bounty
Pneumatic Cannon Bounty
BBQ Ribs Bounty
Add's Trillby's Toy Sword Bounty
Fix:
Shady Jims were unobtainable, they are now obtainable.
2020-01-18 21:59:03 -05:00
Ghom