shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,837 Commits 5 Branches 0 Tags
383685714903cc57a4fcdba74ea5cb9fd318105a
Commit Graph
11957 Commits
Author SHA1 Message Date
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 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
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
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
GhomandGitHub 07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
GhomandGitHub 29c3e72335 You jelly. 2020-01-18 17:41:31 +01:00
Putnam 133cb89b32 hilbert's hotel for ghost dojo 2020-01-18 06:55:26 -08:00
Kraseo 6708607073 fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly 2020-01-18 15:05:07 +01:00
Putnam 81cd277db2 Made metabolic synthesis stop if not fed 2020-01-18 03:47:40 -08:00
Putnam 95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter 2020-01-18 03:39:35 -08:00
Putnam c612462b8c some demodularization + new eligibility stuff 2020-01-18 03:39:27 -08:00
Putnam 3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
chefferzandGitHub 54a2b32f42 Update console.dm 2020-01-17 23:55:44 -05:00
r4d6 0d3706b7f9 Make public shuttle not require access 2020-01-17 22:15:29 -05:00
Ghommie 2fe23b67db fug 2020-01-18 03:37:30 +01:00
Ghommie 224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
kevinz000andGitHub fd440ac379 Merge pull request #10592 from Ghommie/Ghommie-cit508 
Kevinz let some files fall back to CRLF.
 2020-01-17 17:34:13 -07:00
GhomandGitHub da8b29dd23 Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12 
Removes blood duplication via virus mix
 2020-01-18 01:25:34 +01:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
Ghommie eaff51ff40 Kevinz let some files fall back to CRLF. 2020-01-17 23:26:05 +01:00
kevinz000andGitHub aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
GhomandGitHub 34872f6969 Merge pull request #10570 from kevinz000/map_network_helpers 
Power cable + atmos pipe auto mapping helpers
 2020-01-17 22:34:38 +01:00
kevinz000andGitHub eddb6fda68 Update others.dm 2020-01-17 14:32:51 -07:00
kevinz000 3c2e6a959d whitespace renormalize 2020-01-17 14:25:29 -07:00
kevinz000andGitHub 05e2b6a441 Merge pull request #10569 from keronshb/RemoteMoodResearch 
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
 2020-01-17 14:24:13 -07:00
kevinz000andGitHub edccfa3523 Update others.dm 2020-01-17 14:15:08 -07:00
kevinz000andGitHub e69253bf87 Update others.dm 2020-01-17 14:12:51 -07:00
Artur 300fdb431c 0 clue if itll even work. Cowabunga it is. 2020-01-17 19:46:27 +01:00
GhomandGitHub 72a83f05b5 Merge pull request #10375 from r4d6/radsuit 
Add a Radiation Hardsuit
 2020-01-17 17:36:43 +01:00
GhomandGitHub e7b925e779 Merge pull request #10582 from Putnam3145/more_flavor 
Made temp flavor "more" pop up with actual temp flavor
 2020-01-17 14:44:04 +01:00
Putnam 5ace1df9af better logging, that also works 2020-01-16 19:09:13 -08:00
GhomandGitHub c1e9618757 Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs 
Revert "shotgun pointblanking people actually throws them"
 2020-01-16 23:18:37 +01:00