 kevinz000
|
221e05b3c8
|
add line
|
2020-01-20 17:58:58 -07:00 |
|
|
kevinz000
|
12c832b40b
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-01-20 17:53:06 -07:00 |
|
|
kevinz000
|
bb14b255d2
|
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12
|
2020-01-20 17:51:56 -07:00 |
|
|
kevinz000
|
efe3ebdb53
|
bet
|
2020-01-20 17:50:07 -07:00 |
|
|
Hatterhat
|
fae0d6fe3f
|
remember when i hoped i didnt forget something
|
2020-01-20 18:06:07 -06:00 |
|
|
ShadeAware
|
851815f9c4
|
Update recipes_weapon_and_ammo.dm
|
2020-01-20 18:50:57 -05: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 |
|
|
Hatterhat
|
348fa8be86
|
salt pr @kevinz000
|
2020-01-20 17:27:51 -06:00 |
|
|
ShadeAware
|
6f243f9c44
|
Update weaponry.dm
|
2020-01-20 18:08:05 -05:00 |
|
|
ShadeAware
|
cd001411e1
|
Update recipes_weapon_and_ammo.dm
|
2020-01-20 18:02:07 -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 |
|
|
Commandersand
|
62c5fabcac
|
oops
|
2020-01-20 15:18:08 -06:00 |
|
|
Commandersand
|
a3f8233130
|
MEM
|
2020-01-20 15:15:28 -06:00 |
|
|
Trilbyspaceclone
|
89bb60ac16
|
Update parts.dm
|
2020-01-20 16:12:40 -05:00 |
|
|
Trilbyspaceclone
|
9eb9f08a92
|
Update glassware.dm
|
2020-01-20 16:11:42 -05:00 |
|
|
Trilbyspaceclone
|
ab464de0b7
|
Update glass.dm
|
2020-01-20 16:10:12 -05:00 |
|
|
Ghom
|
038f5e4b0e
|
Yea, sorry for being so naive right now.
|
2020-01-20 21:59:12 +01:00 |
|
|
Ghom
|
a921b27c63
|
I want a different maintainer to merge this now.
|
2020-01-20 21:58:21 +01:00 |
|
|
Ghommie
|
9604b27482
|
github web editor is so bad
|
2020-01-20 21:55:02 +01:00 |
|
|
Ghom
|
5500e349e3
|
Merge branch 'master' into kevinz000-patch-10
|
2020-01-20 21:48:28 +01:00 |
|
|
Ghom
|
9ea6e896fb
|
Kevinz, please.
|
2020-01-20 21:43:00 +01:00 |
|
|
Commandersand
|
cd48f1a152
|
forcewall
|
2020-01-20 14:22:23 -06:00 |
|
|
Ghommie
|
b1a4cc0406
|
renormalize
|
2020-01-20 21:17:06 +01: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 |
|
|
kevinz000
|
a53511a53d
|
Update cloning.dm
|
2020-01-20 11:28:27 -07:00 |
|
|
Ghom
|
5bc7229a9f
|
Quick rubber toolbox materials fix.
|
2020-01-20 19:11:43 +01:00 |
|
|
Ghom
|
28a6e6eccf
|
Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this
.357 AP printable from illegal ballistics
|
2020-01-20 18:50:25 +01:00 |
|
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
|
Artur
|
8b21a60ac9
|
MF Line endings
|
2020-01-20 14:09:22 +02:00 |
|
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
|
Putnam
|
dfaa3bf15c
|
Added another flavor obj, "horde" to "hoard"
|
2020-01-20 03:46:44 -08:00 |
|
|
kevinz000
|
051ca8c050
|
checks
|
2020-01-20 03:45:40 -07:00 |
|
|
Putnam
|
67c2fdca52
|
more flavor objectives
|
2020-01-20 01:20:42 -08:00 |
|
|
Putnam
|
8e674817a9
|
errors
|
2020-01-20 00:30:18 -08:00 |
|
|
Seris02
|
ab771d9505
|
I deleted an important thing
|
2020-01-20 15:48:55 +08:00 |
|
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
|
kevinz000
|
593e626233
|
Merge pull request #10346 from deathride58/limbstamlossnerf
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
|
2020-01-19 23:11:02 -07:00 |
|
|
kevinz000
|
ecddef2f21
|
compile
|
2020-01-19 22:58:08 -07:00 |
|
|
Hatterhat
|
28a2cc4a3d
|
.357 AP printable from illegal ballistics
|
2020-01-19 23:55:12 -06: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
|
46376904e0
|
extra line
|
2020-01-19 22:35:46 -07:00 |
|
|
kevinz000
|
a99406b46a
|
oh fucking boy
|
2020-01-19 22:33:16 -07:00 |
|
|
Seris02
|
5524b0fa03
|
yes.
|
2020-01-20 13:00:24 +08:00 |
|
|
kevinz000
|
5d485a95c3
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-19 20:25:51 -07:00 |
|
|
kevinz000
|
5df97ace15
|
fix
|
2020-01-19 20:24:44 -07:00 |
|
|
Putnam
|
06c66617e6
|
m o r e traitor objectives
|
2020-01-19 18:58:10 -08:00 |
|