shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,682 Commits 5 Branches 0 Tags
be3694d858398e7e062fb1e6ec5a5f558ba0a03e
Commit Graph
12390 Commits
Author SHA1 Message Date
GhomandGitHub 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
GhomandGitHub 97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix 
makes the golden ""plastitanium"" toolbox actually plastitanium
 2020-02-02 19:08:16 +01:00
GhomandGitHub 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
GhomandGitHub fb32b018ef Merge pull request #10838 from Owai-Seek/loadout 
Minor Loadout/Outfit Changes
 2020-02-02 18:07:00 +01:00
GhomandGitHub 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 14d749bd76 Weh 2020-02-02 16:23:26 +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
kevinz000andGitHub 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
kevinz000andGitHub c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
kevinz000andGitHub e0f967eaa2 Update apc.dm 2020-02-02 02:57:14 -07:00
kevinz000andGitHub 3812d2d9fa Merge pull request #10850 from Ghommie/Ghommie-cit548 
Fixes maploaded APC terminals direction.
 2020-02-02 02:54:53 -07:00
kevinz000andGitHub 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000andGitHub 2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
kevinz000andGitHub aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542 
clown ops uplink consistency.
 2020-02-02 01:39:31 -07:00
kevinz000andGitHub c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545 
Playback device spam peeve.
 2020-02-02 01:38:52 -07:00
kevinz000andGitHub 38ec4f0e11 Update blood.dm 2020-02-02 01:35:38 -07:00
kevinz000andGitHub b59dd11adc Update blood.dm 2020-02-02 01:35:16 -07:00
TrilbyspacecloneandGitHub 6b2a8d49c9 Update science.dm 2020-02-02 01:39:25 -05:00
Seris02andGitHub 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
MrJWhit d314619d0e Comments out meteor defense tech node 
asdf
 2020-02-01 23:34:33 -05:00
Seris02GitHubGhom
 		d3d4a9f05b Update code/modules/uplink/uplink_items/uplink_roles.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 12:21:32 +08:00
Seris02GitHubGhom
 		8053e43838 Update code/modules/uplink/uplink_items/uplink_roles.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 12:21:26 +08:00
Ghommie cbcb9f32ba Fixes maploaded APC terminals direction. 2020-02-02 04:21:30 +01:00
Ghommie 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Hatterhat e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
GhomandGitHub 79387149a0 Fixes Space Ninja "Nothing" Objective. 2020-02-01 23:23:17 +01:00
Hatterhat 471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00
Hatterhat 81cf670729 shit whoops 2020-02-01 13:22:16 -06:00
GhomandGitHub 6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands 
Energy crossbow changed from RNG to static effects
 2020-02-01 18:58:03 +01:00
GhomandGitHub d523cfd95e Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-02-01 18:54:18 +01:00
GhomandGitHub 74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling 
guns/ammo/projectiles now properly clean up while being deleted
 2020-02-01 18:52:47 +01:00
GhomandGitHub 3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
GhomandGitHub 051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization 
[READY]Ports TG updates to crafting and componentizes it
 2020-02-01 18:36:51 +01:00
GhomandGitHub 45af9dc013 Merge pull request #10808 from Arturlang/macros_begone 
[READY] Ports chem dispenser macro recording
 2020-02-01 18:22:57 +01:00
Putnam 3dcce2b43a added some cleanup code 2020-02-01 09:10:02 -08:00
Putnam aba0379bfb also need these! 2020-02-01 08:53:19 -08:00
Putnam 463036a4f4 made panic bunker save in json 2020-02-01 08:44:05 -08:00
Artur 11fea908bd Fix and rebalance a lil 2020-02-01 14:11:34 +01:00
Putnam3145andGitHub 12f0c35660 Merge pull request #10803 from Seris02/highlightfix 
fixes the whitespace that gets created when you have highlighting strings on
 2020-02-01 04:15:47 -08:00
Putnam3145andGitHub 17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 
fixes a very likely race condition in dueling pistols
 2020-02-01 04:15:32 -08:00
Winter Flare 59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
GhomandGitHub ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches 
[s] fixes a glitch with the PKA
 2020-02-01 10:06:58 +01:00
Putnam3145andGitHub 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Seris02 3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Ghommie 8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Ghommie c75774e67a Actual var. 2020-02-01 06:20:23 +01:00
Ghommie ef3789eeb2 Playback device peeve. 2020-02-01 06:18:22 +01:00