Commit Graph
6848 Commits
Author SHA1 Message Date
Ghommie a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
GhomandGitHub 6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower 5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
kevinz000andGitHub 24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00
kevinz000 8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
GhomandGitHub 5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Putnam 88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam 52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam 53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08: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 ccd557122c Update holosign.dm 2020-02-03 08:35:47 +01:00
GhomandGitHub f2fd48bfd9 Update holosign.dm 2020-02-03 08:31:12 +01: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
Putnam e812844c70 Revert "</span>"
This reverts commit d6d01d848c.
2020-02-01 21:05:27 -08: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
Putnam d6d01d848c </span> 2020-02-01 06:01:54 -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
Putnam3145andGitHub 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Putnam 50a53c6558 aaand a formatting oddity 2020-02-01 00:47:44 -08:00
Putnam 3d9e84a3f8 Tweaks and fixes 2020-02-01 00:23:45 -08:00