shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,035 Commits 5 Branches 0 Tags
5bc590ad52a8a3394e7966b2756c417b1a55bb82
Commit Graph
12077 Commits
Author SHA1 Message Date
Winter Flare 5bc590ad52 Merge branch 'master' into cargocratetglass 2020-01-27 08:03:30 -05:00
Winter Flare 21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
GhomandGitHub 1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark 
drake armor goliath resistance
 2020-01-27 05:45:03 +01:00
GhomandGitHub 9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief 
Relief valve fixes
 2020-01-27 05:37:53 +01:00
GhomandGitHub 27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9 
is_ctf_target now checks for innate faction var rather than clothing
 2020-01-27 00:14:32 +01:00
kevinz000andGitHub f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000andGitHub 97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
GhomandGitHub 9aca79a640 Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10 
Makes monkey gorrilize on radiation easier to achieve
 2020-01-26 05:50:15 +01:00
kevinz000andGitHub 603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450 
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
 2020-01-25 19:33:26 -07:00
Putnam 6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
Putnam aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
Putnam3145andGitHub a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix 
Fix HE Manifold's sprites
 2020-01-25 14:31:11 -08:00
r4d6 d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
kevinz000andGitHub c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -07:00
kevinz000andGitHub c0b7541e62 Merge pull request #10691 from Seris02/mentorfix 
very very tentative fix for the make mentor button
 2020-01-25 08:08:32 -07:00
GhomandGitHub db8abcd7fb Merge pull request #10688 from Citadel-Station-13/kevinz000-patch-1 
Fixes SOME of the problems with hilbert hotel
 2020-01-25 15:32:21 +01:00
GhomandGitHub 4b6a601af7 Merge pull request #10646 from Poojawa/blindvorefixnumber244 
Resolves Minor issues with vore code
 2020-01-25 15:27:12 +01:00
GhomandGitHub 00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban 
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
 2020-01-25 15:25:26 +01:00
kevinz000andGitHub 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525 
Additional runtime fixes.
 2020-01-25 05:54:35 -07:00
kevinz000andGitHub f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524 
Even more runtime fixes.
 2020-01-25 05:54:20 -07:00
kevinz000andGitHub a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523 
A few more, ported, runtime fixes.
 2020-01-25 05:54:03 -07:00
kevinz000andGitHub 72cfd35438 Merge pull request #10684 from Ghommie/Ghommie-cit521 
fix for hypospray jank.
 2020-01-25 05:53:42 -07:00
kevinz000andGitHub 72a8096137 Merge pull request #10683 from Ghommie/Ghommie-cit520 
A few consistencies for those "shoes" that don't actually cover feet.
 2020-01-25 05:53:26 -07:00
kevinz000andGitHub 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519 
Ports "Makes falsewall hide pipes and wires"
 2020-01-25 05:53:07 -07:00
Hatterhat 4db9eadaf1 drake armor deserves to be good 2020-01-24 18:16:40 -06:00
kevinz000andGitHub ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517 
neuter/plural gender fixes.
 2020-01-24 16:15:44 -07:00
kevinz000andGitHub 147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518 
snowflake-friendly towels.
 2020-01-24 16:15:27 -07:00
kevinz000andGitHub afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515 
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
 2020-01-24 16:14:49 -07:00
kevinz000andGitHub ea9513864d Merge pull request #10674 from Xantholne/lunar01 
Culturally Appropriate Lunar Clothes
 2020-01-24 16:14:32 -07:00
GhomandGitHub 2884bbdc23 I'm exiting this code. 👀 2020-01-24 22:15:33 +01:00
GhomandGitHub ba50b4a851 Risky web edit, disgusting contents. 2020-01-24 22:13:55 +01:00
Ghommie 6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
GhomandGitHub d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware 
[Ready] Cargo MK III - Glassware Addtion
 2020-01-24 18:46:25 +01:00
Putnam 0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
GhomandGitHub f5d8e447eb Merge pull request #10676 from Kraseo/virgohairs 
Reorganises/fixes virgo hairs
 2020-01-24 16:39:10 +01:00
Seris02 10ef39d1e3 maybe it'll work 2020-01-24 16:33:20 +08:00
kevinz000andGitHub f626322fbd Merge pull request #10650 from Arturlang/patch-5 
[READY]Adds cheap modular computers to the loadout
 2020-01-24 00:32:57 -07:00
kevinz000andGitHub 831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
kevinz000andGitHub 7cd6490e86 Merge pull request #10526 from Seris02/bowmanupgrade 
allows headsets to be bowmanized and adds a traitor item for that
 2020-01-24 00:21:34 -07:00
kevinz000andGitHub 6ffdc1642b Merge pull request #10632 from Commandersand/nerd 
buffs some wiz spell cooldonws and changes some incantation phrases
 2020-01-24 00:18:41 -07:00
kevinz000andGitHub a5ddd4efa9 Update hilbertshotel.dm 2020-01-24 00:01:02 -07:00
loginsandylogoutGitHubGhom
 		a7a3a3a417 Update code/modules/spells/spell_types/lightning.dm 
po

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-23 22:52:18 -06:00
Ghommie a6c3917bfc M H M H 2020-01-24 05:01:51 +01:00
Ghommie 95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
Ghommie bd6e364612 But wait, there is more! 
No...
 2020-01-24 04:33:55 +01:00
Ghommie 1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00
Ghommie 67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Seris02 90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
kevinz000andGitHub 99d6d589ac Update hilbertshotel.dm 2020-01-23 19:07:39 -07:00
kevinz000andGitHub 65871ca1d3 Update hilbertshotel.dm 2020-01-23 19:07:17 -07:00