Ghom
|
a384b1782b
|
Merge pull request #10164 from kappa-sama/martialartist
What ho, Muscle Wizard! Might you cast us a spell?
|
2019-12-21 15:24:06 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
Lin
|
3dc00519fc
|
Merge pull request #9910 from Ghommie/Ghommie-cit390
Unmodularize gamemodes folder.
|
2019-12-19 23:23:20 +00:00 |
|
Linzolle
|
f3aa363a2e
|
drop
|
2019-12-19 17:19:07 -06:00 |
|
Lin
|
66c6659681
|
Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
|
2019-12-19 23:00:52 +00:00 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
kappa-sama
|
8da0ddda1b
|
oops
|
2019-12-17 16:40:06 -05:00 |
|
Putnam3145
|
37cfec22aa
|
Merge pull request #10066 from Sishen1542/aaaaaaaa
neovgre qol changes
|
2019-12-17 11:40:43 -08:00 |
|
Ghommie
|
3f06661de5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
|
2019-12-17 03:34:11 +01:00 |
|
kappa-sama
|
9f71900052
|
oop
|
2019-12-15 23:29:01 -05:00 |
|
kappa-sama
|
b6c9c73372
|
this cannot go wrong
|
2019-12-15 23:28:17 -05:00 |
|
BlackMajor
|
74cc1ec547
|
Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
|
2019-12-16 14:14:35 +13:00 |
|
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 |
|
BlackMajor
|
4b177c4956
|
Adjusted NF balance
|
2019-12-16 01:20:14 +13: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 |
|
BlackMajor
|
2bf35ec81c
|
Nuclear fist
|
2019-12-14 02:15:09 +13:00 |
|
kappa-sama
|
93c4d3c1af
|
martial artists
|
2019-12-12 23:27:12 -05:00 |
|
Ghommie
|
563a0fef3c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390
|
2019-12-13 02:45:53 +01:00 |
|
Ghommie
|
4502d7b795
|
Ports improved and simplier fire alarms.
|
2019-12-12 22:44:20 +01: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 |
|
Linzolle
|
1e2a4f606c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-08 14:17:00 -06: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 |
|
Sishen
|
85b58b3d15
|
Update scripture_applications.dm
|
2019-12-06 07:56:11 -07:00 |
|
Sishen
|
8da7d1a021
|
b
|
2019-12-06 06:38:48 -07: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 |
|