e985d21ea3
fucking combifan
2020-02-01 20:23:01 -06:00
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
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
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
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
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
ac6695bd68
Merge pull request #10679 from Ghommie/Ghommie-cit517
...
neuter/plural gender fixes.
2020-01-24 16:15:44 -07: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
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
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -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
b0da18e404
Fixes chainsaw force being set to 0 on unwield.
2020-01-23 02:13:55 +01:00
c8cfd4e150
cursed
2020-01-22 16:52:28 -05:00
41191c3974
trauma
2020-01-20 19:01:11 -07: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
c93f16e4d4
Unused variable.
2020-01-21 00:45:51 +01:00
ddf037da92
Trilby's solar panels PR but improved.
2020-01-21 00:28:41 +01:00
0661bc2558
Update PDA.dm
2020-01-20 15:26:24 -07:00
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
4c6af66050
Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16
...
Grenades can now actually have their timers adjusted
2020-01-20 20:02:06 +01:00
5bc7229a9f
Quick rubber toolbox materials fix.
2020-01-20 19:11:43 +01:00
051ca8c050
checks
2020-01-20 03:45:40 -07:00
ecddef2f21
compile
2020-01-19 22:58:08 -07:00
0b10b8cf89
Update code/game/objects/items/devices/PDA/PDA.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-19 22:41:19 -07:00
b1cd0f4ede
Update grenade.dm
2020-01-19 16:11:49 -07:00
088e586b47
Merge pull request #9601 from Ghommie/Ghommie-cit265
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
374f4f143e
Update PDA.dm
2020-01-19 13:45:16 -07:00
90fcedd188
Update grenade.dm
2020-01-19 13:40:09 -07:00
536900a7ac
Merge pull request #10520 from Hatterhat/tg-40920
...
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
45b844c231
more fixes + code improvements
2020-01-19 16:48:19 +08:00
afe7c15645
merge fixes
2020-01-19 16:40:45 +08:00
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
72e2961972
Update PDA.dm
2020-01-18 21:34:24 -07:00
Hatterhat