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

3912 Commits

Author SHA1 Message Date
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02: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
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
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
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
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01: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
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
kevinz000
4304a7dd42 Merge pull request #10602 from Ghommie/Ghommie-cit509 
RPD ventcrawler escapism sanity check.
 2020-01-23 04:47:46 -07:00
kevinz000
1b7265d8c1 Merge pull request #10605 from r4d6/Layer 
Port TG Layers updates and Freezer update
 2020-01-23 04:46:52 -07:00
kevinz000
88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
Artur
0091da8307 Linter fixes 2020-01-23 11:31:41 +02:00
Artur
19fcd89282 Shit 2020-01-23 11:31:41 +02:00
Ghom
047059617c Merge pull request #10645 from r4d6/Modular-Lavaland 
Modularize the mining base
 2020-01-23 02:53:34 +01:00
Ghom
04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 
(is this really a good idea) hitscan emitters
 2020-01-23 02:44:17 +01:00
Ghommie
b0da18e404 Fixes chainsaw force being set to 0 on unwield. 2020-01-23 02:13:55 +01:00
kappa-sama
c8cfd4e150 cursed 2020-01-22 16:52:28 -05:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00