shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

13933 Commits

Author SHA1 Message Date
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
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
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
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
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
Ghom
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
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
Ghom
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
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +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
Putnam
a8569fa7e5 Makes it so that opting out of ass slapping is OPT OUT 2020-01-17 21:31:23 -08:00
chefferz
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
kevinz000
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