shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,825 Commits 5 Branches 0 Tags
14a33ee7dc48e43542a72094abcc3d5dff8424fc
Commit Graph
18475 Commits
Author SHA1 Message Date
HatterhatandGitHub 9b9c7c3018 exo nerf 2020-01-19 20:37:31 -06:00
Seris02 afd848e45a weh 2020-01-20 10:29:09 +08:00
GhomandGitHub 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
GhomandGitHub 8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option 
Made suicide a config flag
 2020-01-20 03:24:00 +01:00
Putnam3145GitHubGhom
 		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
kevinz000andGitHub 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
kevinz000andGitHub b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 374f4f143e Update PDA.dm 2020-01-19 13:45:16 -07:00
kevinz000andGitHub 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
kevinz000andGitHub 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
GhomandGitHub cf9c3a65fd Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans 
Adds bloodsucker antagonist bans
 2020-01-19 16:38:45 +01:00
GhomandGitHub 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
GhomandGitHub 812182230f Merge pull request #10307 from Seris02/stunglasses 
stunglasses
 2020-01-19 16:35:47 +01:00
GhomandGitHub 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 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
kevinz000andGitHub 72e2961972 Update PDA.dm 2020-01-18 21:34:24 -07:00
Winter FlareandGitHub 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
kevinz000andGitHub 9619a6bf5d Update PDA.dm 2020-01-18 19:37:12 -07:00
kevinz000andGitHub 7b8cb0dbfc Update PDA.dm 2020-01-18 19:33:22 -07:00
kevinz000andGitHub bc18ba314a Update PDA.dm 2020-01-18 19:21:47 -07:00
GhomandGitHub 0a5e2cf8ff Merge pull request #10601 from Putnam3145/dojo-hilbert 
Adds 16777216 dorms to the ghost dojo
 2020-01-19 03:02:32 +01:00
r4d6andGitHub 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
LinandGitHub 760bbfa8b6 Merge pull request #10571 from Ghommie/Ghommie-cit507 
Riot foam dart design cost consistency.
 2020-01-18 20:46:16 +00:00
GhomandGitHub d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
GhomandGitHub ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos 
Adds a couple relief valves
 2020-01-18 20:16:30 +01:00
GhomandGitHub 9f2bc48d74 Merge pull request #10600 from Kraseo/ricetriangles 
Fixes sprinkles on jelly donuts + lack of berry juice
 2020-01-18 18:52:14 +01:00
Ghommie a2e1c8ecf1 GLOB. 2020-01-18 18:45:20 +01:00
Ghommie 47b031dad2 Update. 2020-01-18 18:40:13 +01:00
Ghommie 82b65f13f4 RPD anti-ventcrawler escapist sanity check. 2020-01-18 18:23:54 +01:00
GhomandGitHub 07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
GhomandGitHub c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf 
Nerfs RLDs because they hard counter nightmares and night ops.
 2020-01-18 17:42:30 +01:00
GhomandGitHub 29c3e72335 You jelly. 2020-01-18 17:41:31 +01:00
GhomandGitHub 5a613809f5 Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix 
Fixed gibtonite instantly exploding on pick mining
 2020-01-18 16:54:52 +01:00
Putnam 133cb89b32 hilbert's hotel for ghost dojo 2020-01-18 06:55:26 -08:00