Commit Graph

28753 Commits

Author SHA1 Message Date
Ghom
fcbc5149c4 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
r4d6
c78944c5bc Update 2020-01-22 13:47:57 -05:00
CitadelStationBot
86c5d43a1b Automatic changelog generation for PR #10640 [ci skip] 2020-01-21 09:23:42 -06:00
Ghom
0985d1f1d0 Merge pull request #10640 from r4d6/mapfix
Map Fixes
2020-01-21 16:23:39 +01:00
r4d6
1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
CitadelStationBot
25050d7bb6 Automatic changelog generation for PR #10619 [ci skip] 2020-01-20 20:37:44 -06:00
Ghom
8e49c99ca0 Merge pull request #10619 from Seris02/conveyor
conveyor updates
2020-01-21 03:37:42 +01:00
Ghom
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
CitadelStationBot
d7192f6944 Automatic changelog generation for PR #10468 [ci skip] 2020-01-20 19:26:28 -06:00
Ghom
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
CitadelStationBot
437392e0d3 Automatic changelog generation for PR #10588 [ci skip] 2020-01-20 19:17:41 -06: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
CitadelStationBot
9cb11b4414 Automatic changelog generation for PR #10608 [ci skip] 2020-01-20 19:13:32 -06:00
Ghom
4dd576a0ce Merge pull request #10608 from Citadel-Station-13/kevinz000-patch-12
PDA blocking
2020-01-21 02:13:30 +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
CitadelStationBot
ad2db72b0d Automatic changelog generation for PR #10635 [ci skip] 2020-01-20 18:02:56 -06:00
Ghom
01080e2ab6 Merge pull request #10635 from Hatterhat/patch-2
removes det scanner from adv bio
2020-01-21 01:02:54 +01:00
Hatterhat
348fa8be86 salt pr @kevinz000 2020-01-20 17:27:51 -06:00
kevinz000
0661bc2558 Update PDA.dm 2020-01-20 15:26:24 -07:00
CitadelStationBot
a99090ddbf Automatic changelog generation for PR #10617 [ci skip] 2020-01-20 13:02:09 -06: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
CitadelStationBot
06e23144a8 Automatic changelog generation for PR #10621 [ci skip] 2020-01-20 11:50:27 -06: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
CitadelStationBot
5bd2b13233 Automatic changelog generation for PR #10615 [ci skip] 2020-01-20 11:04:34 -06:00
Ghom
b85e752e46 Merge pull request #10615 from keronshb/RemoteMoodResearch
Fixes the nanite sprites deleting the game sprites
2020-01-20 18:04:31 +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
CitadelStationBot
0f4f07dc95 Automatic changelog generation for PR #10346 [ci skip] 2020-01-20 00:11:05 -06: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
Seris02
afd848e45a weh 2020-01-20 10:29:09 +08:00
CitadelStationBot
8e30dd2282 Automatic changelog generation for PR #10597 [ci skip] 2020-01-19 20:24:49 -06:00
Ghom
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
CitadelStationBot
194647a7f4 Automatic changelog generation for PR #10614 [ci skip] 2020-01-19 20:24:02 -06:00
Ghom
8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
2020-01-20 03:24:00 +01:00
Putnam3145
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
Seris02
9ee18fc7f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into conveyor 2020-01-20 09:52:24 +08:00
keronshb
ea088680e2 Fixed sprites
This should be it, really
2020-01-19 19:25:14 -05:00
CitadelStationBot
705bb9c29e Automatic changelog generation for PR #10097 [ci skip] 2020-01-19 17:58:30 -06:00
kevinz000
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
kevinz000
b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
CitadelStationBot
92ead7e65d Automatic changelog generation for PR #9601 [ci skip] 2020-01-19 17:10:59 -06: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