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,384 Commits 55 Branches 0 Tags
fce73c84c70c75eb37d108a4b3b6e3c12f01bc93
Commit Graph

18189 Commits

Author SHA1 Message Date
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Artur
00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
Putnam
2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded 2020-01-06 02:07:09 -08:00
Putnam
72dded26f2 cold-blooded trait 2020-01-06 02:06:19 -08:00
Putnam3145
3b6cf8c952 Merge pull request #10401 from r4d6/SM 
Add three more Supermatter Engine variation for Box
 2020-01-05 23:08:49 -08:00
r4d6
f6099f341b Allow Voice Analyzers to recognize languages 2020-01-05 23:55:31 -05:00
r4d6
6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
Putnam
da830d3449 Added scores for my own dastardly reasons 2020-01-05 19:49:54 -08:00
Lin
7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497 
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
 2020-01-06 03:49:52 +00:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie
4cc0833b28 Fixing an edge case runtime with ore bags. 2020-01-06 01:45:53 +01:00
Letter N
de14073956 limit 2020-01-06 08:34:48 +08:00
Ghommie
1afd3d76cb Fixes lattice's examine. 2020-01-06 01:18:11 +01:00
Ghommie
75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00
Ghom
869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky 
beaker tweaks: setting transfer values verb on altclick, value tweaks
 2020-01-05 23:08:23 +01:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghom
a8741a8462 As you command. 2020-01-05 23:01:35 +01:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Artur
c438d39eb3 Initial Commit 2020-01-05 22:32:29 +01:00
kevinz000
0f909a1437 Update twohanded.dm 2020-01-05 12:50:51 -08:00
kevinz000
6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" 2020-01-05 12:47:24 -08:00
Ghom
14ec7d963a Merge pull request #10224 from Seris02/traitblacklisting 
Makes trait blacklisting remove random positives instead of removing every quirk (new and improved)
 2020-01-05 21:29:51 +01:00
Ghom
1a834edd5f f 2020-01-05 21:27:04 +01:00
kevinz000
4d151b2a7c Update twohanded.dm 2020-01-05 11:20:13 -08:00
kevinz000
46cf029a28 Update twohanded.dm 2020-01-05 11:19:18 -08:00
kevinz000
a8a5ff819d Update IsBanned.dm 2020-01-05 10:06:09 -08:00
kevinz000
4589c7c0c6 Update IsBanned.dm 2020-01-05 08:52:00 -08:00
Ghommie
8c7b648a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425 2020-01-05 17:42:54 +01:00
Trilbyspaceclone
c0f38aa27f Update food_reagents.dm 2020-01-05 11:40:58 -05:00
Ghom
59279a7cd4 Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7 
nerfs pogscarabs
 2020-01-05 16:23:37 +01:00
Ghom
516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394 
biogenerator can print flour sacks and enzyme now, also some boxes idk
 2020-01-05 16:22:44 +01:00
Ghom
5720afb169 Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK 
VIBE CHECK
 2020-01-05 15:51:32 +01:00
Ghom
8bf75be8ff Yea no, go away zoomer kevinz 2020-01-05 15:38:23 +01:00
Ghom
4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf 
reverts that one TEG nerf that forced it to require an arbitrary burnmix
 2020-01-05 15:36:02 +01:00
Ghom
0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix 
Made dev bombs kill through bomb armor again
 2020-01-05 15:33:54 +01:00
Ghom
fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance 
Adds an alcohol intolerance trait (NOT light drinker)
 2020-01-05 15:19:48 +01:00
Ghom
0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248 
Fixes Fermi plushie reaction. Removes carbonation of caramel
 2020-01-05 15:17:14 +01:00
Ghom
eeb9ec5f35 Merge pull request #10380 from Hatterhat/tg-43000-powerfists 
powerfists throw people faster but also leak their gas into the air
 2020-01-05 15:12:06 +01:00
Ghom
2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262 
Corrects MASON Rig's missing flags
 2020-01-05 15:09:05 +01:00
Putnam
be98704abe weird super secret vote 2020-01-05 04:19:21 -08:00
Letter N
ba7f0dab62 doppler logs! 2020-01-05 19:16:37 +08:00
Trilbyspaceclone
609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Hatterhat
f166586ca0 a comma 2020-01-04 21:05:55 -06:00
Hatterhat
5b0d20cf37 this one fucking tab 2020-01-04 19:52:01 -06:00
Hatterhat
46ced736ba what the fuck was that damage my guy 2020-01-04 19:51:06 -06:00
r4d6
4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05:00
Hatterhat
c0e010c612 e 2020-01-04 16:44:11 -06:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghom
9e257599ab Merge pull request #10413 from nik707/master 
Reduces engraving light power
 2020-01-04 22:30:37 +01:00
Ghom
7bebd13c54 Merge pull request #10412 from Linzolle/matchbox-cars 
matchbox runtime fix
 2020-01-04 22:30:13 +01:00