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,910 Commits 55 Branches 0 Tags
797dcfc1e3e8bf5c27c311a480cfd23f32b68a58
Commit Graph

14978 Commits

Author SHA1 Message Date
Fermi
797dcfc1e3 ahaha 2019-10-02 10:08:45 +01:00
Thalpy
72ccc5fe69 Loopzoop 2019-10-02 06:52:01 +01:00
Fermi
13276d3d96 Tests 2019-10-01 07:35:59 +01:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling 
[READY] craftable laser minigun, because why not
 2019-09-28 00:40:02 -07:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
kevinz000
7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix 
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
 2019-09-28 00:28:43 -07:00
kevinz000
8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks 
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
 2019-09-28 00:26:51 -07:00
kevinz000
426104021e Merge pull request #9321 from Linzolle/bloodrites 
some cult fixes + cult qol
 2019-09-28 00:24:15 -07:00
kevinz000
6b33e3bd0b Merge pull request #9322 from Sishen1542/cult 
blood cult conversion no longer requires consent
 2019-09-28 00:23:48 -07:00
kevinz000
cbe6a54531 Merge pull request #9326 from YakumoChen/radioactive-paperweight 
Advanced energy guns glow more
 2019-09-28 00:23:31 -07:00
kevinz000
d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210 
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
 2019-09-28 00:22:38 -07:00
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200 
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
 2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199 
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
 2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147 
Updating spraycans and crayons.
 2019-09-28 00:20:42 -07:00
kevinz000
b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208 
Makes abandoned crates less prone to explosions.
 2019-09-28 00:15:27 -07:00
kevinz000
1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower 
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
 2019-09-28 00:14:47 -07:00
Linzolle
0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
Fermi
3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
Fermi
146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707
3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2 
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
 2019-09-26 23:54:17 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs 
Guardian/Holoparasite Buffs
 2019-09-26 19:33:25 -07:00
kevinz000
06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems 
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
 2019-09-26 19:31:58 -07:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206 
Blood cult altar, forge and archives now use radial menus.
 2019-09-26 19:31:36 -07:00
kevinz000
428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209 
Reduces holy water message spam for blood/clock cultists.
 2019-09-26 19:31:01 -07:00
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
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -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
0389293d4a comma 2019-09-24 02:40:43 +02:00
Ghommie
ee8f1022cc Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs. 2019-09-24 02:02:24 +02:00
Ghommie
274fdf8c06 return. 2019-09-24 01:40:48 +02:00
Ghommie
5a822d95a4 M to L 2019-09-23 18:20:45 +02:00
Ghommie
1fa40dac38 Changes. 2019-09-23 17:25:08 +02:00
Ghommie
05a9b63b79 spam. 2019-09-23 17:06:15 +02:00
Ghommie
4795c60670 Reduces holy water message spam for blood/clock cultists. 2019-09-23 16:48:21 +02:00
Ghommie
4b70a9cf67 Makes abandoned crates less prone to explosions. 2019-09-23 03:09:15 +02:00
Ghommie
f37b676a14 runtimes. 2019-09-22 23:38:48 +02:00
Ghommie
a995e161ca more. 2019-09-22 22:36:29 +02:00
Ghommie
a30dbcd721 vars and procs 2019-09-22 22:34:04 +02:00
Ghommie
5b2cc917b3 Blood cult's alter, forge and archives now use radials. 2019-09-22 22:30:44 +02: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
Fermi
bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00