Commit Graph

6091 Commits

Author SHA1 Message Date
r4d6 5316cc3665 Make dwarves not have an accent when speaking dwarvish 2020-02-08 23:02:32 -05:00
Ghommie eaa6bc2db5 fixing another issue with the hear comsig proc. 2020-02-08 19:37:18 +01:00
kevinz000 826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
Ghom 890274ce87 Update ai.dm 2020-02-08 05:08:06 +01:00
Detective Google f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Ghom 71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
Lin 5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Seris02 4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000 15a59dd729 Merge pull request #10921 from Ghommie/Ghommie-cit557
Lavaland's Herald speech fix.
2020-02-06 23:56:13 -07:00
kevinz000 de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
kevinz000 3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
Ghommie 2d8f85d810 A few nuisances solved. 2020-02-07 02:59:59 +01:00
Ghommie cd339348c9 Also an unwarranted underscore. 2020-02-07 01:22:32 +01:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000 57f6ad5e87 Update login.dm 2020-02-06 05:46:31 -07:00
kevinz000 fe2007d687 Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5
Fixed wheelchair-goers appearing as shoeless
2020-02-06 00:43:45 -07:00
kevinz000 542cae89d4 Merge pull request #10906 from Hatterhat/tg-48717-48726
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
2020-02-06 00:42:05 -07:00
kevinz000 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
kevinz000 73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000 1288a463cf Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
2020-02-06 00:37:52 -07:00
kevinz000 927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
2020-02-05 23:50:41 -07:00
kevinz000 3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000 50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
Ghommie 639ec8066d Another typecheck 2020-02-06 02:19:14 +01:00
Ghommie 60b6d96f45 typecheck. 2020-02-06 02:17:51 +01:00
Ghommie ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Ghommie 01d8086ebd Lavaland's Herald speech fix. 2020-02-05 21:12:15 +01:00
Ghom 6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +01:00
Ghom 7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +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
Ghom 02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11
shoving someone into a wall on the second shove now also disarms their weapon
2020-02-05 07:38:14 +01:00
Ghom 402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
Ghom 4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
Ghom 68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00
Trilbyspaceclone 1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05:00
Ghom aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
Ghom 57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01: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
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