kevinz000
75e1108f33
optizmize
2020-01-24 21:45:43 -07:00
kevinz000
32e4355024
lists are references use copy
2020-01-24 21:44:37 -07:00
Ghommie
f2b04be561
More Runtimenator fixes.
2020-01-25 02:16:45 +01: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
Putnam
c58b4daa35
collectors too
...
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08: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
Seris02
9761d68f4b
more merge conflict fixes
2020-01-24 10:14:31 +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
Ghom
93310b8d4f
can_random_spawn = FALSE for icon-less plushes
2020-01-23 19:42:21 +01:00
Trilbyspaceclone
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
Ghom
51812ae0ec
Proud? No.
2020-01-23 16:33:11 +01:00
ShadeAware
fd04469ff0
H
2020-01-23 08:01:28 -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
Seris02
934c8fe533
updates + thingamajig
2020-01-23 15:25:45 +08: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
ShadeAware
0b1a0e7286
Update weaponry.dm
2020-01-22 17:54:27 -05:00
ShadeAware
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
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
kevinz000
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
c2bcbe868e
merge conflicts + getting rid of commented code for now
2020-01-21 11:23:33 +08:00
kevinz000
41191c3974
trauma
2020-01-20 19:01:11 -07:00
ShadeAware
08016a8461
Ghommie commands, I obey.
2020-01-20 20:22:09 -05:00
Ghom
c244f95ed9
Merge pull request #10588 from PersianXerxes/tweakEngieField
...
Reduces Forcefield Projector Range to Two Tiles
2020-01-21 02:17:38 +01:00
kevinz000
5abc1104c0
ok
2020-01-20 18:03:54 -07:00
