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

12356 Commits

Author SHA1 Message Date
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Ghom
642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting 
[READY]TGUI Next Crafting
 2020-02-05 00:04:21 +01:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker 
Save panic bunker between rounds
 2020-02-04 21:15:37 +01:00
Artur
614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
Artur
0391513220 Works now 2020-02-04 12:05:15 +01:00
kevinz000
13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551 
Further buff and fix to the clown ops' tearstache grenade.
 2020-02-04 03:55:22 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
kevinz000
be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8 
Fixes "2048" subtle emotes.
 2020-02-04 03:34:52 -07:00
kevinz000
ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2 
Fixes Space Ninja "Nothing" Objective.
 2020-02-04 03:33:55 -07:00
kevinz000
b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1 
Hello subtler roleplayers, I see you.
 2020-02-04 03:33:14 -07:00
kevinz000
d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine 
seed extractor examine tweak/fix
 2020-02-04 03:32:57 -07:00
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Ghom
d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange 
Makes a proc for meteor string gen
 2020-02-04 08:15:32 +01:00
Seris02
0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02
8f70bd304d yee 2020-02-04 13:24:30 +08:00
Ghom
bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node 
Comments out meteor defense tech node
 2020-02-04 05:26:25 +01:00
Ghom
33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghom
b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 
Something about runtime errors.
 2020-02-02 16:31:15 -07:00
kevinz000
341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab 
adding stuff to techfabs - RCD carts, combifans
 2020-02-02 16:30:59 -07:00
Ghom
ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
Hatterhat
ca8e40caea i mean its a stupid multiplier regardless 
thanks ghom

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 14:33:45 -06:00
Hatterhat
9190b69ba3 double whoops 2020-02-02 13:40:23 -06:00
Hatterhat
5dc971f8e8 whoops 2020-02-02 13:20:43 -06:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Ghom
97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix 
makes the golden ""plastitanium"" toolbox actually plastitanium
 2020-02-02 19:08:16 +01:00
Ghom
96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks 
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
 2020-02-02 18:07:25 +01:00
Ghom
fb32b018ef Merge pull request #10838 from Owai-Seek/loadout 
Minor Loadout/Outfit Changes
 2020-02-02 18:07:00 +01:00
Ghom
bb1f65813e Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4 
Fixes APC ui_data runtime
 2020-02-02 18:06:44 +01:00
Artur
fe92573fc3 Forgot this 2020-02-02 13:44:44 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544 
Fixed and brutalized clown op slippery weapons a little.
 2020-02-02 03:16:23 -07:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
kevinz000
e0f967eaa2 Update apc.dm 2020-02-02 02:57:14 -07:00
kevinz000
3812d2d9fa Merge pull request #10850 from Ghommie/Ghommie-cit548 
Fixes maploaded APC terminals direction.
 2020-02-02 02:54:53 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
kevinz000
aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542 
clown ops uplink consistency.
 2020-02-02 01:39:31 -07:00
kevinz000
c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545 
Playback device spam peeve.
 2020-02-02 01:38:52 -07:00
kevinz000
38ec4f0e11 Update blood.dm 2020-02-02 01:35:38 -07:00
kevinz000
b59dd11adc Update blood.dm 2020-02-02 01:35:16 -07:00
Seris02
659110ac8c yee again 2020-02-02 13:44:45 +08:00
Seris02
4c2e702d7a yee 2020-02-02 13:18:26 +08:00
Ghommie
fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00