Ghommie
ddf037da92
Trilby's solar panels PR but improved.
2020-01-21 00:28:41 +01:00
Hatterhat and GitHub
348fa8be86
salt pr @kevinz000
2020-01-20 17:27:51 -06:00
Commandersand
62c5fabcac
oops
2020-01-20 15:18:08 -06:00
Commandersand
a3f8233130
MEM
2020-01-20 15:15:28 -06:00
Trilbyspaceclone and GitHub
89bb60ac16
Update parts.dm
2020-01-20 16:12:40 -05:00
Trilbyspaceclone and GitHub
9eb9f08a92
Update glassware.dm
2020-01-20 16:11:42 -05:00
Trilbyspaceclone and GitHub
ab464de0b7
Update glass.dm
2020-01-20 16:10:12 -05:00
Ghom and GitHub
038f5e4b0e
Yea, sorry for being so naive right now.
2020-01-20 21:59:12 +01:00
Ghom and GitHub
a921b27c63
I want a different maintainer to merge this now.
2020-01-20 21:58:21 +01:00
Ghommie
9604b27482
github web editor is so bad
2020-01-20 21:55:02 +01:00
Ghom and GitHub
5500e349e3
Merge branch 'master' into kevinz000-patch-10
2020-01-20 21:48:28 +01:00
Ghom and GitHub
9ea6e896fb
Kevinz, please.
2020-01-20 21:43:00 +01:00
Commandersand
cd48f1a152
forcewall
2020-01-20 14:22:23 -06:00
Ghommie
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
Ghom and GitHub
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
Seris02
ab771d9505
I deleted an important thing
2020-01-20 15:48:55 +08:00
kevinz000 and GitHub
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
Hatterhat
28a2cc4a3d
.357 AP printable from illegal ballistics
2020-01-19 23:55:12 -06:00
Hatterhat and GitHub
9b9c7c3018
exo nerf
2020-01-19 20:37:31 -06:00
Seris02
afd848e45a
weh
2020-01-20 10:29:09 +08:00
Ghom and GitHub
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
Ghom and GitHub
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
Putnam
16f9c1bf78
feedback, EORG allowed
2020-01-19 18:01:21 -08:00
kevinz000 and GitHub
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
kevinz000 and GitHub
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
kevinz000 and GitHub
0b0a6429ea
Update pyrotechnics.dm
2020-01-19 13:31:11 -07:00
Winter Flare
c273853cff
Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks
2020-01-19 15:25:23 -05:00
Winter Flare
cf9d3977b8
Reward Fix
2020-01-19 15:25:20 -05:00
Ghom and GitHub
cf9c3a65fd
Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
...
Adds bloodsucker antagonist bans
2020-01-19 16:38:45 +01:00
Ghom and GitHub
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
Ghom and GitHub
812182230f
Merge pull request #10307 from Seris02/stunglasses
...
stunglasses
2020-01-19 16:35:47 +01:00
Ghom and GitHub
4a0c85e0c0
Merge pull request #10594 from chefferz/chefferz-abductor1
...
Removes shrink rays from abductor console.
2020-01-19 16:12:51 +01:00
Putnam
1bdb515592
made suicide a config flag
2020-01-19 03:44:45 -08:00
Seris02
45b844c231
more fixes + code improvements
2020-01-19 16:48:19 +08:00
Seris02
afe7c15645
merge fixes
2020-01-19 16:40:45 +08:00
Seris02
25d7af31a5
merge fixes
2020-01-19 16:36:04 +08:00
Hatterhat
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
Winter Flare and GitHub
5d4732ed30
Update assistant.dm
2020-01-18 22:36:20 -05:00
Winter Flare
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -05:00
r4d6
2b3f00ed1e
Fix Freezer overlay bug
2020-01-18 22:16:43 -05:00
Winter Flare
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 and GitHub
0a5e2cf8ff
Merge pull request #10601 from Putnam3145/dojo-hilbert
...
Adds 16777216 dorms to the ghost dojo
2020-01-19 03:02:32 +01:00
r4d6 and GitHub
1eec1b11dd
Update passive_vent.dm
2020-01-18 20:00:07 -05:00
r4d6
ae5e87d492
Apparently TG has more code than us
2020-01-18 19:12:00 -05:00
r4d6
5084146400
Port
2020-01-18 18:46:22 -05:00
Ghommie
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
Ghommie
3ee855ab77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 22:14:06 +01:00
Ghommie
ca7bdf5f88
clockwork cuirass now compatible with snakes. The original author is very lazy.
2020-01-18 22:06:14 +01:00
r4d6
810556cbb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
2020-01-18 16:03:49 -05:00
Ghommie