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
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
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
8b21a60ac9
MF Line endings
2020-01-20 14:09:22 +02:00
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02: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
9619a6bf5d
Update PDA.dm
2020-01-18 19:37:12 -07:00
7b8cb0dbfc
Update PDA.dm
2020-01-18 19:33:22 -07:00
bc18ba314a
Update PDA.dm
2020-01-18 19:21:47 -07:00
5084146400
Port
2020-01-18 18:46:22 -05:00
3ee855ab77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 22:14:06 +01:00
810556cbb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
2020-01-18 16:03:49 -05:00
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
ce2fc37df3
Merge pull request #10501 from Putnam3145/more-atmos
...
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
a2e1c8ecf1
GLOB.
2020-01-18 18:45:20 +01:00
47b031dad2
Update.
2020-01-18 18:40:13 +01:00
82b65f13f4
RPD anti-ventcrawler escapist sanity check.
2020-01-18 18:23:54 +01:00
07b3bac674
Merge pull request #10580 from Putnam3145/craft-log
...
Craft logging
2020-01-18 17:47:31 +01:00
c00be1a9b1
Merge pull request #10586 from Tupinambis/RLDNerf
...
Nerfs RLDs because they hard counter nightmares and night ops.
2020-01-18 17:42:30 +01:00
3788bc6676
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
2020-01-17 21:33:13 -08:00
Artur