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

16506 Commits

Author SHA1 Message Date
nik707
56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107 
buffs bluespace apprentice (targeted teleport --> blink)
 2019-11-20 22:55:21 -06:00
kevinz000
540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat 
Makes meteor not repeatable in dynamic.
 2019-11-20 21:53:05 -07:00
nik707
28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109 
emagged medibots now murder the everloving fuck out of slimepeople
 2019-11-20 22:52:11 -06:00
nik707
df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110 
fixes a bug with rnd multiprinting
 2019-11-20 22:51:32 -06:00
nik707
6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111 
Is it the time of year to buff disablers again?
 2019-11-20 22:51:11 -06:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
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
4b41a70e13 Merge pull request #9875 from Putnam3145/required-candidates-works-now 
Makes from-ghosts rulesets cancel if fewer than required candidates
 2019-11-20 21:47:48 -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
kevinz000
95951add5c Merge pull request #9870 from Ghommie/Ghommie-cit377 
Moves some clockie paper info to the right file.
 2019-11-20 21:43:35 -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
34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368 
fixing a few minor issues with console frames building.
 2019-11-19 21:38:58 -07:00
kevinz000
7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370 
Adds a few extra cardboard cutout variants.
 2019-11-19 21:38:32 -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
779fac99b4 Merge pull request #9829 from Ghommie/Ghommie-cit361 
Unborking id consoles.
 2019-11-19 21:33:14 -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
6bee2721cc Merge pull request #9838 from Ghommie/Ghommie-cit366 
Ports "restores legacy sends to SSChat"
 2019-11-19 21:32:05 -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
56413c1460 Merge pull request #9846 from KathrinBailey/IKEA-station-13 
IKEA Station 13: Import TG's Pews
 2019-11-19 21:30:56 -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
63899bdc3d Merge pull request #9827 from Ghommie/Ghommie-cit360 
one line shuttle fix port
 2019-11-19 21:28:50 -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
Putnam
36d860a4ba Makes from-ghosts ruleset cancel if fewer than required candidates 2019-11-19 20:10:06 -08: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
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06:00
deathride58
cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115 
modifies donator config entry to allow multiple ckeys per line
 2019-11-19 13:38:20 -05:00
kevinz000
2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush 
Adds Marisa plushie
 2019-11-19 01:55:59 -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
kevinz000
84e84355c3 Update code/controllers/configuration/config_entry.dm 
Co-Authored-By: Lin <linzolle@gmail.com>
 2019-11-19 01:07:43 -07:00
BlackMajor
31c59b7cad fixes upgrades removing dogborg stuff 2019-11-19 20:50:59 +13:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00: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
86072fe682 " 2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f missing parenthesis. 2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d Adds a few extra cardboard cutout variants. 2019-11-18 03:23:24 +01:00
Ghommie
ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Ghommie
bd41cfbfc5 fixing a few minor issues with console frames building. 2019-11-17 22:44:37 +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