c58b4daa35
collectors too
...
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08: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
9761d68f4b
more merge conflict fixes
2020-01-24 10:14:31 +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
93310b8d4f
can_random_spawn = FALSE for icon-less plushes
2020-01-23 19:42:21 +01: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
934c8fe533
updates + thingamajig
2020-01-23 15:25:45 +08: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
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
c2bcbe868e
merge conflicts + getting rid of commented code for now
2020-01-21 11:23:33 +08: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
ccf66eb04a
bools
2020-01-20 17:59:21 -07:00
221e05b3c8
add line
2020-01-20 17:58:58 -07:00
12c832b40b
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
2020-01-20 17:53:06 -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
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
6f243f9c44
Update weaponry.dm
2020-01-20 18:08:05 -05:00
ffef7cd4db
Update weaponry.dm
2020-01-20 17:33:18 -05: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
6e31db958c
fixes
2020-01-20 12:08:18 -07: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
Putnam