shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,708 Commits 5 Branches 0 Tags
d0cd33a5ead31cfa0cc8f616b498754ba693b10c
Commit Graph
6771 Commits
Author SHA1 Message Date
kevinz000andGitHub d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
Tupinambis 3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
GhomandGitHub 77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL 
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
 2020-02-05 07:02:11 +01:00
GhomandGitHub 472bddb5be Merge pull request #10869 from kevinz000/WHY 
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
 2020-02-05 06:52:20 +01:00
TrilbySpaceClone 06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
LinandGitHub 66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 
Fixing little blood bank gnerator examine runtime error.
 2020-02-04 20:36:28 +00:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot 
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
 2020-02-04 03:34:16 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag 
Makes quick item usage (click-dragging unequipped item) require combat mode
 2020-02-04 03:32:39 -07:00
kevinz000andGitHub 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
GhomandGitHub 6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
kevinz000andGitHub 24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00
GhomandGitHub 5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Artur 5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
kevinz000andGitHub 9a1974e3b6 Update mecha.dm 2020-02-03 00:50:57 -07:00
kevinz000 0a6e304ac2 s 2020-02-03 00:47:51 -07:00
GhomandGitHub d5166322dc I can't believe I have done this. 2020-02-03 08:23:20 +01:00
Ghommie 84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie 0428b05cff Oh snap 2020-02-03 07:20:16 +01: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
kevinz000andGitHub 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
kevinz000andGitHub c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 
Something about runtime errors.
 2020-02-02 16:31:15 -07:00
kevinz000andGitHub 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
GhomandGitHub d4aa410af0 Update atoms.dm 2020-02-02 23:18:30 +01:00
deathride58 10c95fa111 Makes quick item usage (click-dragging unequipped item) require combat mode to be enabled 2020-02-02 13:38:32 -05:00
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 8a81ba9efe Ok here we go. 2020-02-02 18:40:06 +01:00
GhomandGitHub ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +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
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 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 88c20b1ea5 Merge pull request #10834 from Trilbyspaceclone/patch-273 
Craftable Crates!
 2020-02-02 01:43:32 -07:00
kevinz000andGitHub 3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 
clown ops infiltrator consistency.
 2020-02-02 01:39:08 -07:00
kevinz000andGitHub 664c4cdea9 Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1 
Fixing chaplain armaments beacon edge case.
 2020-02-02 01:38:34 -07:00
kevinz000andGitHub e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
Ghommie fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
GhomandGitHub 5b91908674 Fixing little blood bank gnerator examine runtime. 2020-02-02 04:27:17 +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 2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix 
Status Display Fix: It's About Time
 2020-02-02 01:51:07 +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
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