shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,266 Commits 5 Branches 0 Tags
5f5817303835ef0f682cb5f0f69317ba327b4392
Commit Graph

3924 Commits

Author SHA1 Message Date
Tupinambis 5f58173038 I kinda completely fucked my original stunbaton PR. This is just a rePR of it. 2020-01-31 11:55:52 -06:00
Arturlang d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
Ghom 15e5f0ef5d Merge pull request #10644 from ShadeAware/master 
Craftable Switchblades: The Finale
 2020-01-30 21:30:55 +01:00
kevinz000 e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
Ghom 1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
Ghom 793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
Ghom 096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
Ghom b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
Ghom 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
Ghom cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 
[s] more reasonable reagent logging
 2020-01-29 01:59:09 +01:00
kevinz000 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
Ghom fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
kevinz000 a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
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
ShadeAware 92398ae354 Why am I having such trouble with a fucking SPAN CLASS 2020-01-26 19:46:30 -05:00
ShadeAware f7373ae40d WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE 
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
 2020-01-26 19:42:21 -05:00
ShadeAware fffea32a59 Lets the user know they improved their switchblade. 
Confusion is bad. Lets make it not confusing.
 2020-01-26 19:26:58 -05:00
ShadeAware 2cd6ed5f26 REEEE STRAY SLASHES 
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
 2020-01-26 16:31:00 -05:00
ShadeAware 732dd8a3bb Hmm, today I will forget quotes on my strings. 
Thank you Putnam.
 2020-01-26 16:11:22 -05:00
kevinz000 b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation 
made engine rotation properly blacklist 0-weighted ones
 2020-01-26 14:04:31 -07:00
ShadeAware e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting 
Not actually crafting but you get the idea. This won't compile haha.
 2020-01-26 15:53:37 -05:00
Ghom 5fd81c5233 Merge pull request #10717 from Putnam3145/meow-mix-fix 
Makes "Meow Mix" bar sign actually appear
 2020-01-26 05:45:55 +01:00
Putnam 52e473ba07 argh 2020-01-25 19:42:36 -08:00
kevinz000 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 b36d2dc277 Makes "Meow Mix" bar sign actually appear 2020-01-25 13:56:25 -08:00
Ghom 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
kevinz000 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525 
Additional runtime fixes.
 2020-01-25 05:54:35 -07:00
kevinz000 f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524 
Even more runtime fixes.
 2020-01-25 05:54:20 -07:00
kevinz000 a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523 
A few more, ported, runtime fixes.
 2020-01-25 05:54:03 -07:00
kevinz000 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519 
Ports "Makes falsewall hide pipes and wires"
 2020-01-25 05:53:07 -07:00
kevinz000 ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517 
neuter/plural gender fixes.
 2020-01-24 16:15:44 -07:00
Ghommie 856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghommie 6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
Ghommie c69032ff42 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-24 18:56:27 +01:00
Ghom 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
kevinz000 fc684da88d more reasonable 2020-01-24 04:31:54 -07:00
kevinz000 928a8ceea3 Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1 
Quick rubber toolbox materials fix.
 2020-01-24 00:26:22 -07:00
kevinz000 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
kevinz000 07277436ac Merge pull request #10665 from Ghommie/Ghommie-cit513 
Fixes chainsaw force being set to 0 on drop.
 2020-01-24 00:20:26 -07:00
kevinz000 2a706ceb05 Merge pull request #10664 from kappa-sama/patch-17 
makes cursed dragnet take 5 seconds instead of 30 to break out of
 2020-01-24 00:18:05 -07:00
Ghommie bd6e364612 But wait, there is more! 
No...
 2020-01-24 04:33:55 +01:00
Seris02 90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
Ghommie 721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Ghommie 7d5725e450 a dot 2020-01-24 02:31:46 +01:00
Ghommie 78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie 8e5f221bb9 Ports "Makes falsewall hide pipes and wires" 2020-01-24 00:57:27 +01:00
Ghommie 56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
ShadeAware f547c8692b Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE 
YOU CAN'T MAKE ME DO IT GHOMMIE, THAT IS SOMETHING I WILL NOT COMPROMISE ON.
 2020-01-23 16:40:30 -05:00