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
047059617c
Merge pull request #10645 from r4d6/Modular-Lavaland
...
Modularize the mining base
2020-01-23 02:53:34 +01:00
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
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
e3cb379bde
Add the Mining Base as a submap
2020-01-21 20:31:40 -05:00
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07: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
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
a100f9382e
better, there, happy now github
2020-01-20 14:51:53 +08: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
5524b0fa03
yes.
2020-01-20 13:00:24 +08:00
8da447c678
start of stealthmode
2020-01-20 09:51:17 +08: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
ShadeAware