 kevinz000
|
8f60d01208
|
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
|
2020-01-20 22:47:21 -07:00 |
|
|
GhomandGitHub
|
8e49c99ca0
|
Merge pull request #10619 from Seris02/conveyor
conveyor updates
|
2020-01-21 03:37:42 +01:00 |
|
|
GhomandGitHub
|
3c53619f2a
|
Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15
Renames created volume in pyrotechnics to multiplier to alleviate confusion
|
2020-01-21 03:05:22 +01:00 |
|
|
GhomandGitHub
|
7a3f0d140c
|
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
|
2020-01-21 02:26:25 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
kevinz000
|
efe3ebdb53
|
bet
|
2020-01-20 17:50:07 -07:00 |
|
|
HatterhatandGitHub
|
fae0d6fe3f
|
remember when i hoped i didnt forget something
|
2020-01-20 18:06:07 -06: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 |
|
|
HatterhatandGitHub
|
348fa8be86
|
salt pr @kevinz000
|
2020-01-20 17:27:51 -06:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
TrilbyspacecloneandGitHub
|
89bb60ac16
|
Update parts.dm
|
2020-01-20 16:12:40 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
9eb9f08a92
|
Update glassware.dm
|
2020-01-20 16:11:42 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
ab464de0b7
|
Update glass.dm
|
2020-01-20 16:10:12 -05:00 |
|
|
Commandersand
|
cd48f1a152
|
forcewall
|
2020-01-20 14:22:23 -06:00 |
|
|
GhomandGitHub
|
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 |
|
|
kevinz000andGitHub
|
a53511a53d
|
Update cloning.dm
|
2020-01-20 11:28:27 -07:00 |
|
|
GhomandGitHub
|
5bc7229a9f
|
Quick rubber toolbox materials fix.
|
2020-01-20 19:11:43 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
kevinz000
|
051ca8c050
|
checks
|
2020-01-20 03:45:40 -07:00 |
|
|
Seris02
|
ab771d9505
|
I deleted an important thing
|
2020-01-20 15:48:55 +08:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
|
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 |
|
|
HatterhatandGitHub
|
9b9c7c3018
|
exo nerf
|
2020-01-19 20:37:31 -06:00 |
|
|
Seris02
|
afd848e45a
|
weh
|
2020-01-20 10:29:09 +08:00 |
|
|
GhomandGitHub
|
77911f9009
|
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
|
2020-01-20 03:24:46 +01:00 |
|
|
GhomandGitHub
|
8a091c5140
|
Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
|
2020-01-20 03:24:00 +01:00 |
|
|
|
56e58e5c5e
|
whoops
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-19 18:14:33 -08:00 |
|
|
Putnam
|
16f9c1bf78
|
feedback, EORG allowed
|
2020-01-19 18:01:21 -08:00 |
|
|
kevinz000andGitHub
|
65eaf9787a
|
Merge pull request #10097 from Ghommie/Ghommie-cit444
Made traitor kevlar/armor padding accessories examine-proof.
|
2020-01-19 16:58:27 -07:00 |
|
|
kevinz000andGitHub
|
b1cd0f4ede
|
Update grenade.dm
|
2020-01-19 16:11:49 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
374f4f143e
|
Update PDA.dm
|
2020-01-19 13:45:16 -07:00 |
|
|
kevinz000andGitHub
|
90fcedd188
|
Update grenade.dm
|
2020-01-19 13:40:09 -07:00 |
|
|
kevinz000andGitHub
|
0b0a6429ea
|
Update pyrotechnics.dm
|
2020-01-19 13:31:11 -07:00 |
|
|
Winter Flare
|
c273853cff
|
Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks
|
2020-01-19 15:25:23 -05:00 |
|
|
Winter Flare
|
cf9d3977b8
|
Reward Fix
|
2020-01-19 15:25:20 -05:00 |
|
|
GhomandGitHub
|
cf9c3a65fd
|
Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
Adds bloodsucker antagonist bans
|
2020-01-19 16:38:45 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
812182230f
|
Merge pull request #10307 from Seris02/stunglasses
stunglasses
|
2020-01-19 16:35:47 +01:00 |
|
|
GhomandGitHub
|
4a0c85e0c0
|
Merge pull request #10594 from chefferz/chefferz-abductor1
Removes shrink rays from abductor console.
|
2020-01-19 16:12:51 +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 |
|
|
Putnam
|
1bdb515592
|
made suicide a config flag
|
2020-01-19 03:44:45 -08:00 |
|