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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,802 Commits 55 Branches 0 Tags
d0840074b5e0624ed8757271ffdb8a8014a318fb
Commit Graph

14902 Commits

Author SHA1 Message Date
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
kevinz000
35359594ea Merge pull request #9338 from lolman360/FUCKYOUPOOJYOUACTULPIECEOFSHIT 
Reverts an undocumented change
 2019-09-23 20:34:50 -07:00
kevinz000
9270adba8a Merge pull request #9334 from Ghommie/Ghommie-cit204 
Enables emojis for PDA messages.
 2019-09-23 20:17:25 -07:00
kevinz000
039b2a03a0 Merge pull request #9332 from Ghommie/Ghommie-cit202 
Prevents sofas being wielded and thus transformed into normal chairs.
 2019-09-23 20:16:53 -07:00
kevinz000
a7e7fab301 Merge pull request #9331 from Ghommie/Ghommie-cit201 
Fixing machinery's alt-click rotation.
 2019-09-23 20:16:35 -07:00
Ghommie
64ce8460c0 a comma. 2019-09-22 14:53:02 +02:00
Ghommie
ff451c8cf4 I don't want to send emoji assets to every machine interfacing with PDA messages. 
Just the chat tab.
 2019-09-22 14:50:37 +02:00
lolman360
6598a8c9c2 Pooj 2019-09-22 16:18:15 +10:00
kevinz000
e44f52d89a Merge pull request #9122 from Sishen1542/oops-i-did-it-again 
nerf gygax melee damage, removes mech KO punches and replaces with extra knockback (and also neuters actuator overload)
 2019-09-21 19:07:40 -07:00
kevinz000
72cbaf1307 Merge pull request #9307 from BurgerLUA/Jetpack-Tweak 
Reduces jetpack speed bonus on CERTAIN jetpacks while doubling efficiency
 2019-09-21 19:04:11 -07:00
Ghommie
bf2f4b5df1 Enables emojis for PDA messages. 2019-09-21 22:42:06 +02:00
Ghommie
33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00
Ghommie
5878fb351e Fixing machinery's alt-click rotation. 2019-09-21 19:56:14 +02:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1 
Doubles stamina regen when standing/laying down
 2019-09-21 01:48:20 -07:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades 
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
 2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal 
Removes a lot of unused files
 2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193 
Fixed a few dozen suits' body coverage inconsistencies.
 2019-09-21 01:43:52 -07:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197 
Fixes undershirts n socks colors prefs.
 2019-09-21 01:43:10 -07:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94 
Fixes clown shoes and work boots.
 2019-09-21 01:42:03 -07:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood 
Its a blood bath! A BlueSpace Blood Bath!
 2019-09-21 01:39:29 -07:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell 
Abductor batteries can be used to unlock abductor research
 2019-09-21 01:39:08 -07:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195 
leftover legcuffs/handcuffs overlays fix.
 2019-09-21 01:38:14 -07:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament 
ports ligament surgeries as well as dissection
 2019-09-21 01:37:47 -07:00
kevinz000
0a71762444 Merge pull request #9308 from Sishen1542/greyboiz2 
fix greyshirt response team
 2019-09-20 14:16:17 -07:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy 
Makes brass tools look better*
 2019-09-20 12:09:33 -07:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
Sishen
fa4f05b919 Update ert.dm 2019-09-18 20:13:12 -04:00
BurgerLua
9003404ea8 Further tweak 2019-09-18 15:16:02 -07:00
BurgerLua
fe3117a006 Added Jetpack Tweaks 2019-09-18 14:49:00 -07:00
kappa-sama
34d109f6a2 on further thought, all of them 2019-09-18 17:12:06 -04:00
kappa-sama
9bdbf444e4 abductor batteries to tech tree 2019-09-18 17:09:24 -04:00
TrilbySpaceClone
5ecf68918b tada 2019-09-18 03:47:52 -04:00
kevinz000
a6f4548349 Merge pull request #9295 from Ghommie/Ghommie-cit196 
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
 2019-09-17 22:03:29 -07:00
kevinz000
2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks 
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
 2019-09-17 22:00:59 -07:00
Ghommie
8bf4d5754e I'm a moron. 2019-09-18 04:23:52 +02:00
deathride58
18e97451a3 Merge branch 'master' into jobcodesanitychecks 2019-09-17 22:15:09 -04:00
Ghommie
abb8450e29 ninja shoes. 2019-09-18 04:07:51 +02:00
deathride58
cc6e436e96 further fixes 2019-09-17 21:48:48 -04:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a code quality 2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6 aaaaa 2019-09-18 01:24:44 +02:00