cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,755 Commits 55 Branches 0 Tags
2884bbdc23c6465a91ea773ee216e83a6c3dba59
Commit Graph

18424 Commits

Author SHA1 Message Date
Ghom
2884bbdc23 I'm exiting this code. 👀 2020-01-24 22:15:33 +01:00
Ghom
ba50b4a851 Risky web edit, disgusting contents. 2020-01-24 22:13:55 +01:00
Poojawa
ace1950800 Makes listen checks a tad cheaper. 
Improves external sounds with falloff
 2020-01-22 00:07:39 -06:00
Poojawa
a665aeb50f ok just skip this line I guess 2020-01-21 23:33:11 -06:00
Poojawa
9415ea095d Fixes blindness on transfers 2020-01-21 23:32:32 -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
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
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
kevinz000
efe3ebdb53 bet 2020-01-20 17:50:07 -07: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
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
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
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
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
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
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
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
kevinz000
0b0a6429ea Update pyrotechnics.dm 2020-01-19 13:31:11 -07:00
Ghom
cf9c3a65fd Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans 
Adds bloodsucker antagonist bans
 2020-01-19 16:38:45 +01: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
Ghom
812182230f Merge pull request #10307 from Seris02/stunglasses 
stunglasses
 2020-01-19 16:35:47 +01:00
Ghom
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
Seris02
25d7af31a5 merge fixes 2020-01-19 16:36:04 +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
kevinz000
7b8cb0dbfc Update PDA.dm 2020-01-18 19:33:22 -07:00
kevinz000
bc18ba314a Update PDA.dm 2020-01-18 19:21:47 -07:00
Ghom
0a5e2cf8ff Merge pull request #10601 from Putnam3145/dojo-hilbert 
Adds 16777216 dorms to the ghost dojo
 2020-01-19 03:02:32 +01:00
Ghommie
072eca6ec0 fixes and more PRs 2020-01-18 23:01:00 +01:00
Ghommie
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
r4d6
810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00