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

10605 Commits

Author SHA1 Message Date
kevinz000
c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378 
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
 2019-11-20 21:48:41 -07:00
kevinz000
47888bd208 Merge pull request #9877 from Ghommie/Ghommie-cit381 
Unmodularize pAI holo-chassis icons.
 2019-11-20 21:47:00 -07:00
kevinz000
f82dd255dc Merge pull request #9869 from Hatterhat/ayy-dna-manip 
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
 2019-11-20 21:46:37 -07:00
Ghommie
75ac087988 Unmodularize pAI holo-chassis icons. 2019-11-20 05:54:00 +01: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
67abc4ff03 Merge pull request #9855 from Ghommie/Ghommie-cit371 
Fixing suit store overlays
 2019-11-19 21:38:22 -07:00
kevinz000
c1a416e257 Merge pull request #9858 from Ghommie/Ghommie-cit372 
Fixing gasping xenos.
 2019-11-19 21:37:17 -07:00
kevinz000
d692d3fe01 Merge pull request #9835 from Ghommie/Ghommie-cit363 
Ports "Self sustaining fix"
 2019-11-19 21:32:57 -07:00
kevinz000
755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364 
Ports "Uses defines for turf atmos"
 2019-11-19 21:32:42 -07:00
kevinz000
a012347c52 Merge pull request #9837 from Ghommie/Ghommie-cit365 
Ports "Fixes an Ancient LINDA Bug"
 2019-11-19 21:32:23 -07:00
kevinz000
9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus 
Fixes D.A.B. loadout name
 2019-11-19 21:31:47 -07:00
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
Ghommie
7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit 2019-11-20 03:35:06 +01:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06: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
Ghommie
63a3919ed2 Fixing gasping xenos. 2019-11-18 20:58:22 +01:00
Ghommie
21c1f8bc2a Fixing suit store overlays 2019-11-18 15:19:39 +01:00
Ghommie
ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Anonymous
b714c32ca2 Partly Reverts "Fixes loadout name, adds DAB outf- 
it crate to cargo"

This reverts commit 1bb8ff1c0c.
Removes cargo changes.

In other news, I can't please everyone and I hate society,
thank you for coming to my TED Talk.
 2019-11-17 19:44:22 +03:00
NopemanMcHalt
8f7571a115 Don't do webedits, folks 
I mean seriously it's quick but there's chance of fucking up something
 2019-11-17 18:18:20 +03:00
Putnam
ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
Ghommie
773b3e6605 Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin! 2019-11-17 04:11:37 +01:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie
6d6cc93e50 Ports "Self sustaining fix" 2019-11-17 02:59:38 +01: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