Commit Graph

4252 Commits

Author SHA1 Message Date
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
Trilbyspaceclone 4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
Trilbyspaceclone fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
Ghom b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
2020-02-05 02:03:42 +01:00
Hatterhat fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghom fc7c900cde Update death.dm 2020-02-04 20:51:01 +01:00
Ghom 56ef22f472 Update death.dm 2020-02-04 20:49:49 +01:00
TrilbySpaceClone f66d401516 forgot to move the var 2020-02-04 07:16:15 -05:00
TrilbySpaceClone 4842e29c2e buffs carps again 2020-02-04 07:09:50 -05: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 8db3fbdf88 modularize out taser rework 2020-02-04 03:49:09 -07:00
kevinz000 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
kevinz000 aa129b9539 Update species.dm 2020-02-04 03:46:13 -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 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 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 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Seris02 49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghommie a0caada859 runtime drifting 2020-02-04 08:05:27 +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
ancientpower 5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghom b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
Ghommie 0f708cb856 pAI shenanigeans 2020-02-04 02:26:42 +01:00
Ghommie d13d8dd953 Less hacky. 2020-02-04 02:13:11 +01:00
Ghommie 63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
ancientpower be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
Ghom 76e34c7e0f Update update_icons.dm 2020-02-03 08:48:12 +01:00
Ghommie 81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +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
Ghom ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01: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 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 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -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
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 55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghom 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
Putnam3145 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Ghommie 8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
Ghom 1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
2020-02-01 01:41:36 +01:00
Artur 54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00