Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Artur
58f4f58cd2
Slaughter demons shouldnt bleed
2019-12-16 00:05:51 +02:00
Artur
6124fbf316
Hopefully this fixes the linter errors
2019-12-14 19:04:36 +02:00
Artur
d0493ac471
Reviewer and linter fixes, and veil tweak
2019-12-14 17:09:39 +02:00
Artur
9faf3d1dac
Mooaar fixeees
2019-12-14 01:01:38 +02:00
Putnam3145
71b2754aa6
Merge pull request #10121 from kappa-sama/patch-12
...
plasmafist wizard plasmafist wizard
2019-12-12 12:28:49 -08:00
Lin
9ec8458803
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
BlackMajor
8817f04e19
Merge pull request #9747 from Ghommie/Ghommie-cit329
...
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
Putnam3145
beddaa1a99
Merge pull request #10053 from Ghommie/Ghommie-cit429
...
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
Artur
488c0f1833
Mindshield fix and thrall buff
2019-12-09 19:08:42 +02:00
kappa-sama
f790d675d9
flavor text
2019-12-09 09:06:11 -05:00
kappa-sama
e111429a30
the hippie thing
2019-12-08 23:37:33 -05:00
Ghommie
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
Artur
d184bdd77a
Whoops
2019-12-08 22:22:30 +02:00
Artur
9773b530f8
More fixes. Urgh
2019-12-08 21:47:25 +02:00
Lin
24e4673c2b
Merge pull request #10057 from Ghommie/Ghommie-cit431
...
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
Ghommie
7cc332960b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-12-07 05:30:07 +01:00
Artur
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
kevinz000
d217a9f445
Merge pull request #10032 from Ghommie/Ghommie-cit418
...
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000
bbd482015c
Merge pull request #10033 from Ghommie/Ghommie-cit419
...
Fixes traitor codewords highlight and some other hear signal hooks.
2019-12-05 21:28:03 -07:00
Ghommie
d6fe78f4a7
fixes on_mob eyes overlays not updating properly sometimes.
2019-12-06 03:38:39 +01:00
Ghommie
238655d599
Fixes eyes blindness a little.
2019-12-06 00:10:50 +01:00
Artur
82d1497ddc
Fixes bad buds and toxin healing
2019-12-05 17:29:00 +02:00
Putnam
4e2c72f2ed
makes traitor removable
2019-12-03 16:58:32 -08:00
Artur
af4eaf7f0f
Fixeesss
2019-12-03 23:09:11 +02:00
Ghommie
fa270c8a79
leftovers.
2019-12-03 06:48:25 +01:00
Ghommie
6e318bfb09
Fixes traitor codewords highlight and some other hear signal hoonks.
2019-12-03 06:31:35 +01:00
Ghommie
3c7d2972de
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +01:00
Artur
90113838a7
Iconfix and co
...
Traits instead of procs for fakedeath
Quickfix
Whoops this too
Loadsa fixes
Nerfs stamina regen
Too slow
Hm
2019-12-02 19:48:02 +02:00
Artur
f48d8016d5
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-01 13:51:57 +02:00
Artur
9b20879ba5
Ditto
2019-12-01 00:07:07 +02:00
Putnam
00f7305aa5
holy shit
2019-11-29 17:15:49 -08:00
Artur
a6e6274039
Reviewer fixes and spacing
2019-11-30 01:21:07 +02:00
Artur
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
GrayRachnid
6a13801c1a
I assume this is what ghommie meant
2019-11-27 18:34:36 -05:00
GrayRachnid
47e3cd346f
Fixes codewords and MKUltra enthrall hearing.
2019-11-27 16:36:19 -05:00
Ghommie
f9680130f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-27 18:48:20 +01:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
kevinz000
be679b97a6
Merge pull request #9885 from Commandersand/cuckcult
...
Makes the brass skewer more ouchie than ouchie~
2019-11-23 11:45:24 -07:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
loginsandylogout
a95b78af52
Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 00:52:52 -06:00
nik707
8d363b8e9d
Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
...
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
nik707
56d2c0edad
Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
...
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
loginsandylogout
5395e0c893
meme
2019-11-20 10:35:40 -06:00
kevinz000
20bcca0398
Merge pull request #9852 from Ghommie/Ghommie-cit369
...
Fixing some wizard den teleportation issues.
2019-11-19 21:39:20 -07:00
kevinz000
877b79ae1c
Merge pull request #9822 from Putnam3145/dynamic-wizard-rework
...
Reworked how wizard spells interact with dynamic
2019-11-19 21:29:09 -07:00
