kevinz000
|
c790478a3d
|
Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
|
2020-02-12 23:58:14 -07:00 |
|
kevinz000
|
4e419eed03
|
Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
|
2020-02-12 23:56:53 -07:00 |
|
Ghom
|
8c2801fda6
|
Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
|
2020-02-12 11:14:27 +01:00 |
|
Ghom
|
0917617543
|
Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2
improves getImplant by using locate()
|
2020-02-12 10:33:08 +01:00 |
|
kevinz000
|
f247c6d8c6
|
Update pai_defense.dm
|
2020-02-11 04:27:22 -07:00 |
|
kevinz000
|
58db43621d
|
Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
|
2020-02-11 00:42:15 -07:00 |
|
keronshb
|
42fda3d88b
|
CogChamp
Adds the CogChamp drink! Bloodcult gets one so why not Clock?
|
2020-02-10 21:18:51 -05:00 |
|
kevinz000
|
520dd57bf9
|
Update mob_helpers.dm
|
2020-02-10 04:33:27 -07:00 |
|
Ghom
|
c8a62e7acf
|
Merge pull request #10985 from r4d6/Dwarf
Dwarven Update
|
2020-02-10 12:23:23 +01:00 |
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
kevinz000
|
79146bce9b
|
Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3
Fixes AI unanchoring not properly removing the no teleport trait.
|
2020-02-10 04:15:29 -07:00 |
|
kevinz000
|
c9e5fd1c17
|
Merge pull request #10988 from YakumoChen/master
Reverts 10486 (Observe verb in the Ghost tab)
|
2020-02-10 04:14:33 -07:00 |
|
kevinz000
|
88fa342c26
|
Merge pull request #10976 from Ghommie/Ghommie-cit565
fixing another issue with the hear component signal.
|
2020-02-10 04:09:19 -07:00 |
|
Ghom
|
0f2f5ab639
|
Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
|
2020-02-09 21:38:50 +01:00 |
|
r4d6
|
9ba0a1b470
|
Code update
|
2020-02-09 07:21:47 -05:00 |
|
YakumoChen
|
1c24797de1
|
revert 10486
|
2020-02-09 06:41:13 +00:00 |
|
Ghommie
|
f6adce72fb
|
Something about missing private sprites and their bad code.
|
2020-02-09 06:51:57 +01:00 |
|
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 |
|
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
|
cd339348c9
|
Also an unwarranted underscore.
|
2020-02-07 01:22:32 +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
|
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
|
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 |
|