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 18:02:57 +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
Chayse Ramsay
0cf1415969 [SPEEDMERGE] Glass Machine :b:roke 2019-09-05 16:28:18 +01:00
BlackMajor
fbc2d3c8fe Ports dogborg sprites from RP to main 
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
 2019-09-06 01:23:53 +12:00
Linzolle
5bc6c9ea04 requested change 2019-09-04 21:18:18 -05:00
nik707
d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80 
TK dusting now uses the proper removal procs to prevent bugs
 2019-09-04 20:14:06 -05:00
kappa-sama
364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-sama
599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
nik707
586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191 
Fixing clockie mass recall that I apparently didn't really fix correctly before.
 2019-09-04 19:45:19 -05:00
kappa-sama
876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
Linzolle
f4ed7d04f0 help screen 2019-09-04 14:19:14 -05:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
Alonefromhell
eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen
d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
TrilbySpaceClone
fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -04:00
Trilbyspaceclone
5eba0d55f9 Update trash.dm 2019-09-03 11:09:03 -04:00
Trilbyspaceclone
7476f117da pie 2019-09-03 10:45:33 -04:00
Trilbyspaceclone
8394f2f1c7 grammer 2019-09-03 10:44:59 -04:00
Trilbyspaceclone
3f957ea488 grammer 2019-09-03 10:43:29 -04:00
Trilbyspaceclone
5168f2b233 Update granters.dm 2019-09-03 07:37:37 -04:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
YakumoChen
807f7f4771 completely removes autoscan as originally intended 2019-09-03 06:03:46 +00:00
YakumoChen
fbcce02f78 still removes autoscan 2019-09-03 05:44:51 +00:00
Trilbyspaceclone
c616c0e288 Update food_reagents.dm 2019-09-02 20:00:38 -04:00
nik707
44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass 
Adds support for trit, bz, and pluox to the SM
 2019-09-02 18:37:42 -05:00
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears 
Plasmaglass Tables, Spears, Shards (Take 2)
 2019-09-02 18:37:22 -05:00
nik707
67f4276aab Merge pull request #9104 from Sishen1542/tbaton 
classic & telebaton no longer have attack delay
 2019-09-02 18:35:56 -05:00
nik707
ca8166f940 Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68 
Buffs cult/clockcult wall explosion_block
 2019-09-02 18:28:05 -05:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox 
Adds the Male AI vox voice.
 2019-09-02 18:27:03 -05:00
nik707
3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50 
Increases the default space ruin z-level count to 2
 2019-09-02 18:25:30 -05:00
nik707
238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47 
Increases click resolution to 0.5 seconds
 2019-09-02 18:23:34 -05:00
Sishen
3f954f10a7 Update runes.dm 2019-09-02 02:09:59 -04:00
Sishen
0b6eb6e34c Update holy_weapons.dm 2019-09-01 22:36:39 -04:00
Trilbyspaceclone
473cde6a9d huh 2019-08-31 21:16:14 -04:00
TrilbySpaceClone
c2f189bbdb Merge branch 'master' into fruit 2019-08-31 21:09:59 -04:00
Ghommie
4085b479d1 Fixing clockie mass recall that I apparently didn't really fix before. 2019-09-01 01:45:33 +02:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
279a6ed83e bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths 2019-08-31 17:57:36 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
nik707
e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219 
Ports "Fixes slimes not feeding #44760"
 2019-08-31 02:09:15 -05:00
nik707
c826e1b412 Merge pull request #9175 from lolman360/master 
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
 2019-08-31 02:06:33 -05:00
nik707
7e8e32f848 idiot 2019-08-31 02:05:13 -05:00
nik707
daff8899dd retard 2019-08-31 02:04:58 -05:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
nik707
1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79 
improves an exploit patch
 2019-08-31 01:48:20 -05:00
nik707
01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218 
Fixes "Silver Core Luminescents Can Spawn "Oops" #9215"
 2019-08-31 01:37:50 -05:00
kappa-sama
db22ae64d4 im gonna go ape 2019-08-30 22:46:52 -04:00
kevinz000
64b29e9e1f Update supermatter.dm 2019-08-30 15:22:58 -07:00
kevinz000
975b55e26d Update singularity.dm 2019-08-30 15:19:30 -07:00
kevinz000
a3917a81b0 Update energy_ball.dm 2019-08-30 15:18:22 -07:00