shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,905 Commits 5 Branches 0 Tags
c7765a032bf2ba1460bf714e28862e8eef009b46
Commit Graph

10583 Commits

Author SHA1 Message Date
kevinz000
c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak 
Dynamic summon events tweaks
 2019-11-19 21:31:14 -07:00
kevinz000
4d1a9a0773 Merge pull request #9816 from Ghommie/Ghommie-cit356 
Ports "Fixes MMIs not being able to use mecha equipment"
 2019-11-19 21:30:13 -07:00
kevinz000
a2f85cd19d Merge pull request #9819 from Ghommie/Ghommie-cit358 
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
 2019-11-19 21:29:30 -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
kevinz000
f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur 
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
 2019-11-19 21:28:25 -07:00
kevinz000
40a01dedfe Merge pull request #9806 from BlackMajor/Yote 
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
 2019-11-19 01:54:47 -07:00
BlackMajor
6cdb54bef1 Fix service borg lights breaking 2019-11-19 21:29:05 +13:00
BlackMajor
31c59b7cad fixes upgrades removing dogborg stuff 2019-11-19 20:50:59 +13:00
Lin
512939f1e6 Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112 
kinetic crushers no longer drop if you try to use it with one hand
 2019-11-19 03:23:12 +00:00
Putnam
ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
kevinz000
d9b24b20d1 Merge pull request #9817 from Ghommie/Ghommie-cit357 
Fixing a keybinding issue.
 2019-11-16 03:02:43 -07: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
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
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
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
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
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
kevinz000
d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu 
[READY] Desperate Assistance Battleforce
 2019-11-14 15:43:51 -07:00
Ghommie
98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
Putnam
6d8f2b8914 Made s?laughter demon and apprentice cost threat, too. 2019-11-14 06:42:13 -08:00
Putnam
28a14fd01e Removed janky nuke disk threat increase 2019-11-14 05:57:56 -08:00
Putnam
304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -08:00