shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,113 Commits 5 Branches 0 Tags
b08503de700287bcbacece35fc2dd952eec3c312
Commit Graph

29113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
b08503de70 Merge pull request #10699 from Putnam3145/no-newline-on-txts 
Made .editorconfig not auto-newline on txts
 2020-01-28 17:58:23 -07:00
kevinz000
3de59b75fa Merge pull request #10678 from Ghommie/Ghommie-cit516 
Stops the donor patriotic cape from being considered a bed sheet.
 2020-01-28 17:58:07 -07:00
Putnam3145
6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7 
[s] botany logging
 2020-01-28 16:57:50 -08:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
Putnam3145
a00d1fb05e Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5 
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
 2020-01-28 16:56:50 -08:00
kevinz000
3ed288dd14 Merge pull request #10750 from LetterN/patch-1 
Updates README
 2020-01-28 17:56:21 -07:00
CitadelStationBot
540e76d118 Automatic changelog generation for PR #10754 [ci skip] 2020-01-28 18:56:14 -06:00
kevinz000
96df844aa3 Merge pull request #10754 from MalricB/Virgomangood 
Reunites Shaggy (hair from virgo) with Scooby Terrowin
 2020-01-28 17:56:11 -07:00
CitadelStationBot
194d26b044 Automatic changelog generation for PR #10753 [ci skip] 2020-01-28 18:55:52 -06:00
kevinz000
70d4be0ea6 Merge pull request #10753 from Trilbyspaceclone/changlog_messing3 
Updates changlog
 2020-01-28 17:55:49 -07:00
kevinz000
3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 
An oversight with one of the new area helper procs.
 2020-01-28 17:55:39 -07:00
CitadelStationBot
94d1b7a035 Automatic changelog generation for PR #10414 [ci skip] 2020-01-28 11:12:33 -06:00
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
CitadelStationBot
678c0f0ff5 Automatic changelog generation for PR #10752 [ci skip] 2020-01-28 11:09:03 -06:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
CitadelStationBot
6b0dc5d438 Automatic changelog generation for PR #10590 [ci skip] 2020-01-28 10:58:47 -06:00
Ghom
7ff01ac152 Merge pull request #10590 from KathrinBailey/Kat'sBoxRework 
Fixes bugs in BoxStation; turns on docking beacons on Box; fixes roundstart atmos differences.
 2020-01-28 17:58:44 +01:00
CitadelStationBot
f6d79e8846 Automatic changelog generation for PR #10765 [ci skip] 2020-01-28 05:01:36 -06:00
Putnam3145
8e0a674845 Merge pull request #10765 from Citadel-Station-13/kevinz000-patch-15 
skittish sanity checks aka "Kev, this isn't a powergamer trait" they said, and now look where we are at?
 2020-01-28 03:01:33 -08:00
kevinz000
a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
CitadelStationBot
8bae366652 Automatic changelog generation for PR #10764 [ci skip] 2020-01-28 00:38:08 -06:00
kevinz000
b903c110d9 Merge pull request #10764 from deathride58/antinyoom 
fixes spacemen going at lightspeed on local/testing servers
 2020-01-27 23:38:05 -07:00
deathride58
74d0fe2770 fixes spacemen going at lightspeed on local/testing servers 2020-01-28 00:18:54 -05:00
CitadelStationBot
bef55b54b0 Automatic changelog generation for PR #10709 [ci skip] 2020-01-27 21:06:04 -06:00
Ghom
2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin 
Adds mammal mutation toxin to green slime extract recipes
 2020-01-28 04:06:01 +01:00
CitadelStationBot
bc0297f504 Automatic changelog generation for PR #10706 [ci skip] 2020-01-27 21:02:15 -06:00
Putnam3145
209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530 
...? ...? (masked human mob examine pet peeve)
 2020-01-27 19:02:13 -08:00
Ghom
362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
KathrinBailey
13d9509610 removes backup 2020-01-28 02:24:32 +00:00
KathrinBailey
bc7c28a62f removes improvements 
this is now solely bug fixes
 2020-01-28 02:22:56 +00:00
Winter Flare
5883124e0d Removals. 
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
 2020-01-27 20:47:28 -05:00
Winter Flare
24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
CitadelStationBot
6877a965f6 Automatic changelog generation for PR #10743 [ci skip] 2020-01-27 19:18:35 -06:00
Ghom
f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT 
Spinfusors are no longer purchasable from cargo
 2020-01-28 02:18:32 +01:00
CitadelStationBot
a52bfb13ad Automatic changelog generation for PR #10737 [ci skip] 2020-01-27 18:44:23 -06:00
kevinz000
5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531 
Refactoring APTFT altclick/verb options into flags
 2020-01-27 17:44:20 -07:00
CitadelStationBot
ed1f9be2a8 Automatic changelog generation for PR #10742 [ci skip] 2020-01-27 18:43:49 -06:00
kevinz000
3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532 
Fixes det revolver being risky to use.
 2020-01-27 17:43:46 -07:00
Winter Flare
6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -05:00
Ghom
0ed72c7722 Merge pull request #10692 from Citadel-Station-13/TESTING 
faster get_hearers_in_view/getallcontents i guess
 2020-01-27 21:06:52 +01:00
CygnusB
675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin 
self-insert baby pr florida man tries to merge his hair back into citadel
 2020-01-27 15:51:38 -03:00
CitadelStationBot
6258e07213 Automatic changelog generation for PR #10733 [ci skip] 2020-01-27 10:35:02 -06:00
Ghom
5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself 
the zombie powder nerf - tgstation#46931
 2020-01-27 17:34:58 +01:00
TrilbySpaceClone
443239fb7c updates changlog 2020-01-27 11:16:29 -05:00
Winter Flare
5bc590ad52 Merge branch 'master' into cargocratetglass 2020-01-27 08:03:30 -05:00
Winter Flare
21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
Letter N
1c528062b5 updates readme 2020-01-27 18:05:48 +08:00
CitadelStationBot
5e10d297e1 Automatic changelog generation for PR #10703 [ci skip] 2020-01-26 22:45:06 -06:00
Ghom
1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark 
drake armor goliath resistance
 2020-01-27 05:45:03 +01:00
CitadelStationBot
5b04936d96 Automatic changelog generation for PR #10711 [ci skip] 2020-01-26 22:39:02 -06:00