shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,663 Commits 5 Branches 0 Tags
90fcedd1882fccac54366f461cfc02853c74bd48
Commit Graph

11866 Commits

Author SHA1 Message Date
DeltaFire 3f36a0096c Bruh moment 
fixes a missing bracketty boi
 2019-11-16 20:45:23 +01:00
DeltaFire15 9f8547d42d Another sync (#4) 
AAAAAAAAA
 2019-11-16 16:12:12 +01:00
DeltaFire15 350dd6ed3a Sync with master (#3) 
Alot of stuff, honk
 2019-11-16 16:03:25 +01:00
DeltaFire 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
Seris02 b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
kevinz000 d9b24b20d1 Merge pull request #9817 from Ghommie/Ghommie-cit357 
Fixing a keybinding issue.
 2019-11-16 03:02:43 -07:00
Seris02 8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08:00
Putnam a85142053d Makes it refund threat too (wow, didn't even think about it!) 2019-11-16 00:43:44 -08:00
Putnam c9de03675e actually no i'm reworking this 2019-11-16 00:36:09 -08:00
kevinz000 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
kevinz000 66f8b5f404 Merge pull request #9769 from Ghommie/Ghommie-cit336 
ID console fixes and other tweaks.
 2019-11-16 01:17:23 -07:00
Seris02 e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08:00
GrayRachnid c1dfa4227b ok this works and i don't know why 2019-11-16 00:52:52 -05:00
GrayRachnid 206f3df25c i hate dogborgs and pixel_x 2019-11-16 00:41:55 -05:00
DeltaFire 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
Lin 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Ghommie 7a1f3dcdba Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor. 2019-11-15 23:14:28 +01:00
GrayRachnid 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
Ghommie 978b675986 FUCK 2019-11-15 20:12:54 +01:00
Ghommie 2b104a7698 Ports "Fixes MMIs not being able to use mecha equipment" 2019-11-15 18:40:45 +01:00
DeltaFire 85b0cb37b8 Little typofix 
Bruh
 2019-11-15 18:12:57 +01:00
DeltaFire 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
Putnam 4f06a25951 Made staff of change require/cost threat 2019-11-14 23:26:59 -08:00
Putnam 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
lolman360 57bd0f5fb8 Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS" 
This reverts commit bc6c617c27.
 2019-11-15 16:42:34 +11:00
lolman360 bc6c617c27 DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS 2019-11-15 16:42:26 +11:00
Ghommie 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
Ghommie 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
Ghommie 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
kevinz000 02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
kevinz000 178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00
kevinz000 40523802f3 Merge pull request #9804 from Ghommie/Ghommie-cit351 
Unmodularize keybindings.
 2019-11-14 16:36:55 -07:00
kevinz000 5b5e655b18 Merge pull request #9801 from Ghommie/Ghommie-cit348 
Fixing anti-meta hidden random event reports.
 2019-11-14 16:28:07 -07:00
kevinz000 b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings 
Reducing meteor warning time
 2019-11-14 16:24:10 -07:00
kevinz000 81303b1225 Merge pull request #9786 from Ghommie/Ghommie-cit345 
Fixing some reagents taste descriptions.
 2019-11-14 16:22:54 -07:00
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000 499afa6666 Merge pull request #9663 from Trilbyspaceclone/patch-235 
Buffs/Fixes embalming
 2019-11-14 15:54:38 -07:00
kevinz000 47f01907f0 Merge pull request #9666 from Ghommie/Ghommie-cit296 
Shameless late game crew nerf
 2019-11-14 15:54:13 -07:00
kevinz000 d15a1b0e6b Merge pull request #9680 from Owai-Seek/extendedbounties 
Reworked a bit of bounty stuff.
 2019-11-14 15:53:07 -07:00
kevinz000 318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303 
Dullahans fixes and QoL.
 2019-11-14 15:52:11 -07:00
kevinz000 8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07:00
kevinz000 617b0db310 Merge pull request #9692 from Ghommie/Ghommie-cit309 
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
 2019-11-14 15:48:34 -07:00
kevinz000 af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
kevinz000 dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00