5bc590ad52
Merge branch 'master' into cargocratetglass
2020-01-27 08:03:30 -05:00
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
92398ae354
Why am I having such trouble with a fucking SPAN CLASS
2020-01-26 19:46:30 -05:00
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
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
2cd6ed5f26
REEEE STRAY SLASHES
...
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
732dd8a3bb
Hmm, today I will forget quotes on my strings.
...
Thank you Putnam.
2020-01-26 16:11:22 -05:00
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
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
2acb52fb56
Merge pull request #10690 from Ghommie/Ghommie-cit525
...
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
4376434e01
woops
2020-01-24 22:31:05 -07:00
b33e6cd79e
scanner fix
2020-01-24 22:00:03 -07:00
75e1108f33
optizmize
2020-01-24 21:45:43 -07:00
32e4355024
lists are references use copy
2020-01-24 21:44:37 -07:00
ac6695bd68
Merge pull request #10679 from Ghommie/Ghommie-cit517
...
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
6fe0c57c42
run-extra-times fixes.
2020-01-24 20:48:32 +01:00
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
d5daae98c7
Merge pull request #9905 from Trilbyspaceclone/glassware
...
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
fc684da88d
more reasonable
2020-01-24 04:31:54 -07:00
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
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
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
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
90c7149d8c
merge conflict fixes
2020-01-24 10:27:48 +08:00
7d5725e450
a dot
2020-01-24 02:31:46 +01:00
78934c52fe
A handful of runtime fixes.
2020-01-24 02:27:06 +01:00
56d31b0c8c
neuter/plural gender fixes.
2020-01-23 22:50:30 +01:00
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
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
51812ae0ec
Proud? No.
2020-01-23 16:33:11 +01:00
fd04469ff0
H
2020-01-23 08:01:28 -05:00
4304a7dd42
Merge pull request #10602 from Ghommie/Ghommie-cit509
...
RPD ventcrawler escapism sanity check.
2020-01-23 04:47:46 -07:00
1b7265d8c1
Merge pull request #10605 from r4d6/Layer
...
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
88f625edfc
Merge pull request #10636 from Ghommie/Ghommie-cit512
...
Trilby's solar panels PR but improved.
2020-01-23 04:35:13 -07:00
0091da8307
Linter fixes
2020-01-23 11:31:41 +02:00
19fcd89282
Shit
2020-01-23 11:31:41 +02:00
b0da18e404
Fixes chainsaw force being set to 0 on unwield.
2020-01-23 02:13:55 +01:00
0b1a0e7286
Update weaponry.dm
2020-01-22 17:54:27 -05:00
1c4f37b5bf
MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG
...
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
2020-01-22 17:50:57 -05:00
c8cfd4e150
cursed
2020-01-22 16:52:28 -05:00
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
41191c3974
trauma
2020-01-20 19:01:11 -07:00
08016a8461
Ghommie commands, I obey.
2020-01-20 20:22:09 -05:00
c244f95ed9
Merge pull request #10588 from PersianXerxes/tweakEngieField
...
Reduces Forcefield Projector Range to Two Tiles
2020-01-21 02:17:38 +01:00
5abc1104c0
ok
2020-01-20 18:03:54 -07:00
221e05b3c8
add line
2020-01-20 17:58:58 -07:00
bb14b255d2
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12
2020-01-20 17:51:56 -07:00
9f488c80a1
Update weaponry.dm
2020-01-20 18:49:04 -05:00
Winter Flare