shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,895 Commits 5 Branches 0 Tags
5baa5ebf55f5a059afc1745cff701983343357b6
Commit Graph
32895 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub 5baa5ebf55 Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2 
Fixes toilet cistern loot spawning on the floor.
 2020-04-14 01:35:04 -07:00
CitadelStationBot fb82619bd3 Automatic changelog generation for PR #11829 [ci skip] 2020-04-14 03:34:48 -05:00
kevinz000andGitHub 1f900f0e9d Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5 
Fixing a whacky miniature cell duping issue.
 2020-04-14 01:34:45 -07:00
CitadelStationBot ef2bfd74c2 Automatic changelog generation for PR #11830 [ci skip] 2020-04-14 03:34:22 -05:00
kevinz000andGitHub e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07:00
CitadelStationBot ee3bd67756 Automatic changelog generation for PR #11831 [ci skip] 2020-04-14 03:34:01 -05:00
kevinz000andGitHub f460d0dab0 Merge pull request #11831 from Ghommie/Ghommie-cit677 
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
 2020-04-14 01:33:57 -07:00
CitadelStationBot 9c2a3fb4cc Automatic changelog generation for PR #11838 [ci skip] 2020-04-14 03:33:10 -05:00
kevinz000andGitHub 2961bf8698 Merge pull request #11838 from kappa-sama/gamingtime 
makes circuit theft admin only
 2020-04-14 01:33:06 -07:00
Putnam3145andGitHub d1bdcd3401 Merge pull request #11840 from Citadel-Station-13/Ghommie-patch-1 
Actually fixed wizard garbs.
 2020-04-13 17:26:55 -07:00
CitadelStationBot ac36cd49a5 Automatic changelog generation for PR #11379 [ci skip] 2020-04-13 19:10:49 -05:00
kevinz000andGitHub 6d7cc834f6 Merge pull request #11379 from Ghommie/Ghommie-cit611 
Polychromic element.
 2020-04-13 17:10:45 -07:00
Ghommie 39e645b018 I knew using lazy helpers wouldn't have helped much. 2020-04-14 01:55:01 +02:00
Ghommie 42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie 616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
kappa-sama 94bcc6a64b removes these 2020-04-13 14:38:30 -04:00
Ghommie 8c995dbad9 Making things work. 2020-04-13 19:16:55 +02:00
Ghommie bfa006fac1 Fixing runtime errors. 2020-04-13 17:25:13 +02:00
CitadelStationBot 1cd57c265b Automatic changelog generation for PR #11834 [ci skip] 2020-04-13 09:44:18 -05:00
GhomandGitHub 25f1a83473 Merge pull request #11834 from deathride58/linuxfail2topic 
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
 2020-04-13 16:44:15 +02:00
Ghommie db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie 0816512150 more work. 2020-04-13 16:09:52 +02:00
CitadelStationBot affac4d907 Automatic changelog generation for PR #11275 [ci skip] 2020-04-13 07:50:27 -05:00
kevinz000andGitHub 9f2ed092c5 Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6 
Reenables the swarmers event.
 2020-04-13 05:50:24 -07:00
CitadelStationBot a1ade99b98 Automatic changelog generation for PR #10986 [ci skip] 2020-04-13 07:25:46 -05:00
GhomandGitHub dfa58cb517 Merge pull request #10986 from Seris02/atomwalkers 
wall walking boots for traitors
 2020-04-13 14:25:43 +02:00
GhomandGitHub 8145513ba7 Actually fixed wizard garbs. 2020-04-13 14:19:13 +02:00
GhomandGitHub 6157500f25 FYI, Dropped() already handles it. 2020-04-13 14:16:48 +02:00
Seris02 468c59bf49 oops 2020-04-13 20:12:20 +08:00
kevinz000andGitHub 768909020e Merge pull request #11827 from kiwedespars/nerf 
nerfs immortal haste cd
 2020-04-12 22:35:10 -07:00
kevinz000andGitHub 105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678 
Item color removal port fixes.
 2020-04-12 22:34:45 -07:00
Seris02 950038f4a7 merge fixes? 2020-04-13 11:12:16 +08:00
Seris02 f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02 105f83e7ec merge fixes 2020-04-13 11:08:26 +08:00
Seris02 b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
kappa-sama efe36a02e0 bye 2020-04-12 22:19:10 -04:00
kevinz000andGitHub 5bc138662c Merge pull request #11836 from Citadel-Station-13/Ghommie-patch-7 
Made a few for loops typed again.
 2020-04-12 18:36:26 -07:00
Ghommie 0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02:00
GhomandGitHub 609eb190e0 Update area_copy.dm 2020-04-13 03:29:07 +02:00
kevinz000andGitHub e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674 
Little Holodeck refactor.
 2020-04-12 17:03:11 -07:00
CitadelStationBot deacf27454 Automatic changelog generation for PR #11824 [ci skip] 2020-04-12 19:02:54 -05:00
kevinz000andGitHub 80de717dc8 Merge pull request #11824 from Ghommie/Ghommie-cit673 
Fixes occasional tunnel hole in the space hermit ruin.
 2020-04-12 17:02:52 -07:00
CitadelStationBot 2d96c7eb6e Automatic changelog generation for PR #11819 [ci skip] 2020-04-12 19:02:39 -05:00
kevinz000andGitHub 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
CitadelStationBot 3aad79f6e1 Automatic changelog generation for PR #11811 [ci skip] 2020-04-12 19:01:53 -05:00
kevinz000andGitHub 8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671 
Fixes and standarizes a few liver troubles. Re-enables liver failure.
 2020-04-12 17:01:50 -07:00
kevinz000andGitHub f647fe92fa Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4 
Re-enables hulks.
 2020-04-12 17:01:22 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
CitadelStationBot affe2463b6 Automatic changelog generation for PR #11817 [ci skip] 2020-04-12 18:48:16 -05:00
GhomandGitHub d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2 
More dynamic tweaks + dynamic latejoin changelings
 2020-04-13 01:48:12 +02:00