Seris02
90c7149d8c
merge conflict fixes
2020-01-24 10:27:48 +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
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
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
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
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
kevinz000
221e05b3c8
add line
2020-01-20 17:58:58 -07:00
kevinz000
bb14b255d2
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12
2020-01-20 17:51:56 -07:00
ShadeAware
9f488c80a1
Update weaponry.dm
2020-01-20 18:49:04 -05:00
Ghommie
c93f16e4d4
Unused variable.
2020-01-21 00:45:51 +01:00
Ghommie
ddf037da92
Trilby's solar panels PR but improved.
2020-01-21 00:28:41 +01:00
ShadeAware
6f243f9c44
Update weaponry.dm
2020-01-20 18:08:05 -05:00
ShadeAware
ffef7cd4db
Update weaponry.dm
2020-01-20 17:33:18 -05:00
kevinz000
0661bc2558
Update PDA.dm
2020-01-20 15:26:24 -07:00
Ghommie
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
Ghom
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
Ghom
5bc7229a9f
Quick rubber toolbox materials fix.
2020-01-20 19:11:43 +01:00
kevinz000
051ca8c050
checks
2020-01-20 03:45:40 -07:00
kevinz000
ecddef2f21
compile
2020-01-19 22:58:08 -07:00
kevinz000
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
kevinz000
b1cd0f4ede
Update grenade.dm
2020-01-19 16:11:49 -07:00
kevinz000
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
kevinz000
374f4f143e
Update PDA.dm
2020-01-19 13:45:16 -07:00
kevinz000
90fcedd188
Update grenade.dm
2020-01-19 13:40:09 -07:00
Ghom
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
Putnam
cc1fcee4ac
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
2020-01-19 03:56:41 -08:00
Seris02
45b844c231
more fixes + code improvements
2020-01-19 16:48:19 +08:00
Seris02
afe7c15645
merge fixes
2020-01-19 16:40:45 +08:00
Hatterhat
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
kevinz000
72e2961972
Update PDA.dm
2020-01-18 21:34:24 -07:00
kevinz000
9619a6bf5d
Update PDA.dm
2020-01-18 19:37:12 -07:00
