Commit Graph

1650 Commits

Author SHA1 Message Date
Artur 5602289013 Parent call
Failed to get in the previous commit for some reason.
2020-02-05 20:25:04 +01:00
Artur 9951f291fd Reviewer suggestions 2020-02-05 20:14:35 +01:00
Artur 8b5e3e6004 Removes the shitty verb 2020-02-05 14:55:47 +01:00
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
Seris02 d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Hatterhat bad4b5cb56 huskies 2020-02-04 22:13:03 -06:00
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
Hatterhat fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
ancientpower 335c28ff25 fixes for the requested changes 2020-02-04 17:02:13 -06:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
ancientpower a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower 0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
ancientpower 9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower 524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06: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 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07: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
ancientpower 937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -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
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
Ghommie fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Seris02 18489e5b65 merge fixes 2020-02-02 11:51:26 +08: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
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Artur b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
Artur 880e8c3e04 Whoopsie 2020-01-31 22:34:01 +01:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Artur dd1083e7da How did i fuck up this bad 2020-01-31 18:32:12 +01:00
Artur d0b03877ea Should be right now 2020-01-31 18:24:49 +01:00
Artur bcb2bfca02 Why did tg remove this 2020-01-31 18:21:00 +01:00
Artur bb8eed7ae6 Initial Commit 2020-01-31 13:41:49 +01:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Ghom cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
2020-01-29 01:59:09 +01:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07: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
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
Seris02 e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000 41f9669a83 Update other_reagents.dm 2020-01-26 13:29:55 -07:00
Ghommie 41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
Hatterhat ff2785f24b boy i hope this fucking compiles 2020-01-26 02:47:41 -06:00
kevinz000 776729797d Update holder.dm 2020-01-25 05:56:32 -07:00
kevinz000 f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000 72cfd35438 Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
2020-01-25 05:53:42 -07:00
kevinz000 72a8096137 Merge pull request #10683 from Ghommie/Ghommie-cit520
A few consistencies for those "shoes" that don't actually cover feet.
2020-01-25 05:53:26 -07:00
Seris02 15874ea50f mammal mutation toxin 2020-01-25 17:16:13 +08:00
kevinz000 ea65dfa631 iron undocumneted reagent change 2020-01-24 21:32:55 -07:00
kevinz000 147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00