b7f4580414
robotics winter coat
2019-11-17 11:50:56 +08:00
773b3e6605
Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin!
2019-11-17 04:11:37 +01:00
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
6d6cc93e50
Ports "Self sustaining fix"
2019-11-17 02:59:38 +01:00
4d71f95b16
Merge branch 'master' into HeadCorgi
2019-11-17 12:24:04 +11:00
8a54a73be4
e
2019-11-17 12:12:46 +11:00
aed866339f
pickup pickup pickup pickup 100% pickup
2019-11-17 12:00:17 +11:00
df4ae7ea18
Just some fixes
...
Fun fun fun
2019-11-16 21:11:08 +01:00
3f36a0096c
Bruh moment
...
fixes a missing bracketty boi
2019-11-16 20:45:23 +01:00
9f8547d42d
Another sync ( #4 )
...
AAAAAAAAA
2019-11-16 16:12:12 +01:00
350dd6ed3a
Sync with master ( #3 )
...
Alot of stuff, honk
2019-11-16 16:03:25 +01:00
3d8c41e143
Changes up the blood stunhand against hostile cultists
...
The stunhand used by bloodcult will no longer hardstun + deal damage to hostile cultists. Instead, it will deal some brute + debuff the enemy cultist, duration of the debuffing is a bit longer then for the clockie kindle since that one also applies belligerent.
Also fixes up some stuff / adds a safety check in the clockie changes
2019-11-16 15:49:21 +01:00
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
d9b24b20d1
Merge pull request #9817 from Ghommie/Ghommie-cit357
...
Fixing a keybinding issue.
2019-11-16 03:02:43 -07:00
8db64df364
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-16 16:54:27 +08:00
a85142053d
Makes it refund threat too (wow, didn't even think about it!)
2019-11-16 00:43:44 -08:00
c9de03675e
actually no i'm reworking this
2019-11-16 00:36:09 -08:00
21775ad3ee
Merge pull request #9813 from Ghommie/Ghommie-cit355
...
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
66f8b5f404
Merge pull request #9769 from Ghommie/Ghommie-cit336
...
ID console fixes and other tweaks.
2019-11-16 01:17:23 -07:00
e0e3c510d4
adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats
2019-11-16 15:31:20 +08:00
c1dfa4227b
ok this works and i don't know why
2019-11-16 00:52:52 -05:00
206f3df25c
i hate dogborgs and pixel_x
2019-11-16 00:41:55 -05:00
57027661a9
Changes blood halberd to no longer hardstun hostile cult when thrown
...
It will now, simillar to the Ratvarian counterpart, instead apply damage and some confusion, plus some weak knockdown.
2019-11-16 04:51:59 +01:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
7a1f3dcdba
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-15 23:14:28 +01:00
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
978b675986
FUCK
2019-11-15 20:12:54 +01:00
2b104a7698
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-15 18:40:45 +01:00
85b0cb37b8
Little typofix
...
Bruh
2019-11-15 18:12:57 +01:00
d34ef11bac
Some more changes to clock stuff
...
Adds some flavor for the kindle spell, changes the transgression sigil to burn cultists instead of stunning, adds belingerent debuff to spearthrow and kindle attack when used on hostile cultists
2019-11-15 18:01:42 +01:00
4f06a25951
Made staff of change require/cost threat
2019-11-14 23:26:59 -08:00
f3c4897b48
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-14 22:31:48 -08:00
57bd0f5fb8
Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS"
...
This reverts commit bc6c617c27
2019-11-15 16:42:34 +11:00
bc6c617c27
DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS
2019-11-15 16:42:26 +11:00
c7a3652d0a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-15 01:12:36 +01:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
178aedc5cc
Merge pull request #9754 from Ghommie/Ghommie-cit330
...
porting "global to static"
2019-11-14 16:38:27 -07:00
40523802f3
Merge pull request #9804 from Ghommie/Ghommie-cit351
...
Unmodularize keybindings.
2019-11-14 16:36:55 -07:00
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
5b5e655b18
Merge pull request #9801 from Ghommie/Ghommie-cit348
...
Fixing anti-meta hidden random event reports.
2019-11-14 16:28:07 -07:00
b670c94ca4
Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
...
Reducing meteor warning time
2019-11-14 16:24:10 -07:00
81303b1225
Merge pull request #9786 from Ghommie/Ghommie-cit345
...
Fixing some reagents taste descriptions.
2019-11-14 16:22:54 -07:00
178501f415
Merge pull request #9785 from Ghommie/Ghommie-cit344
...
tweaked towel sprites tonalities and fixing their onmob suit overlay.
2019-11-14 16:22:28 -07:00
8c247a566a
Merge pull request #9783 from Ghommie/Ghommie-cit343
...
Fixing Aux base camera RCD door settings and toggle window type actions.
2019-11-14 16:22:08 -07:00
9b56aa0cae
Merge pull request #9781 from Hatterhat/northstar-fast-intents
...
northstar works on all intents, is slightly better than help intenting people with the hugs hands
2019-11-14 16:18:31 -07:00
4ad56ac1e2
Merge pull request #9614 from Trilbyspaceclone/patch-234
...
Lowers ghosts and insain clowns hp to 120 from 1e6
2019-11-14 16:07:43 -07:00
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Seris02