kevinz000
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
kevinz000
90fcb4cc14
initial changes
2020-01-19 16:13:05 -07:00
kevinz000
b1cd0f4ede
Update grenade.dm
2020-01-19 16:11:49 -07:00
kevinz000
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
374f4f143e
Update PDA.dm
2020-01-19 13:45:16 -07:00
kevinz000
90fcedd188
Update grenade.dm
2020-01-19 13:40:09 -07:00
kevinz000
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
cf9c3a65fd
Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
...
Adds bloodsucker antagonist bans
2020-01-19 16:38:45 +01:00
Ghom
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
812182230f
Merge pull request #10307 from Seris02/stunglasses
...
stunglasses
2020-01-19 16:35:47 +01:00
Ghom
4a0c85e0c0
Merge pull request #10594 from chefferz/chefferz-abductor1
...
Removes shrink rays from abductor console.
2020-01-19 16:12:51 +01:00
Putnam
cc1fcee4ac
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
2020-01-19 03:56:41 -08:00
Putnam
1bdb515592
made suicide a config flag
2020-01-19 03:44:45 -08:00
Seris02
bb6fac4390
I shall actually compile it this time
2020-01-19 17:01:51 +08:00
Putnam
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
Seris02
0ea3e275e3
yep
2020-01-19 16:54:46 +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
Seris02
1ee7885392
re:woops
2020-01-19 16:28:12 +08:00
Seris02
fd49c1302b
woops
2020-01-19 15:55:24 +08:00
Seris02
47d1f46172
fixes and stuff
2020-01-19 15:53:32 +08:00
Seris02
f54417f99e
fixes
2020-01-19 15:50:48 +08:00
Seris02
718ff58e0b
fixes + advanced injectors
2020-01-19 15:17:57 +08:00
Putnam
5eba760aa8
Reworked survivalist
2020-01-18 22:07:54 -08:00
Hatterhat
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
Putnam
e1cf63e0ac
Greentext tweaked
2020-01-18 21:32:42 -08:00
Putnam
d287835d14
Made quirk blacklisting antag-sided
2020-01-18 21:29:27 -08:00
kevinz000
72e2961972
Update PDA.dm
2020-01-18 21:34:24 -07:00
Winter Flare
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
Putnam
3dc3f28748
Moved cold-blooded to negative, made it cost -2
2020-01-18 18:41:04 -08:00
kevinz000
9619a6bf5d
Update PDA.dm
2020-01-18 19:37:12 -07:00
kevinz000
7b8cb0dbfc
Update PDA.dm
2020-01-18 19:33:22 -07:00
kevinz000
bc18ba314a
Update PDA.dm
2020-01-18 19:21:47 -07:00
Ghom
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
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
Lin
760bbfa8b6
Merge pull request #10571 from Ghommie/Ghommie-cit507
...
Riot foam dart design cost consistency.
2020-01-18 20:46:16 +00:00
Ghom
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
Ghom
ce2fc37df3
Merge pull request #10501 from Putnam3145/more-atmos
...
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
