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
36,430 Commits 55 Branches 0 Tags
ed6780159053450cbc1b51c82cf1ba8f8bc51da4
Commit Graph

5050 Commits

Author SHA1 Message Date
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
b30607b759 ayys update - ordering shit 2020-08-03 21:37:11 +08:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
silicons
d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou 
prefs for headpat wagging
 2020-08-03 02:30:57 -07:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen 
bomb stands now use components
 2020-08-02 12:52:07 -05:00
silicons
06f5ce6401 buffs shoving (#12925) 
* ^w^

* ok

* ok
 2020-08-02 18:30:09 +02:00
zerothebigboy
aa782f1105 a 2020-08-02 02:27:24 -04:00
zerothebigboy
34a8d8f798 a 2020-08-02 01:38:23 -04:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
silicons
2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering 
drastically lowers the damage-related benefits of combat mode
 2020-08-01 03:33:43 -07:00
silicons
d1edbab264 Update life.dm 2020-07-31 14:39:40 -07:00
Lin
16fb4b3291 Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot 
monkeys stop bleeding nonstop
 2020-07-31 14:21:57 -05:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
timothyteakettle
caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
timothyteakettle
55be55ce0f Revert "end our suffering" 
This reverts commit 4e1fcc4e08.
 2020-07-30 02:29:13 +01:00
timothyteakettle
4e1fcc4e08 end our suffering 2020-07-30 02:28:53 +01:00
timothyteakettle
940fe8240d monkey blood fix 2020-07-30 01:57:09 +01:00
silicons
c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life 
Plugs bloodsucker LifeTick into BiologicalLife
 2020-07-29 14:02:22 -07:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces 
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
 2020-07-28 21:51:43 -05:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
Lin
ae02a7348c Merge pull request #12929 from Citadel-Station-13/silicons-patch-59 
silicons (and all other nonhuman mobs) can now block (with the right items)
 2020-07-28 21:48:14 -05:00
Lin
e8ab87c396 Merge pull request #12928 from Citadel-Station-13/silicons-patch-58 
silicons (and any other nonhuman mob) can now parry
 2020-07-28 21:48:03 -05:00
Lin
91dc8b96d0 Merge pull request #12932 from silicons/ok_2 
perfect parries with an energy sword now reflect projectiles back at their shooter
 2020-07-28 21:45:53 -05:00
Lin
18fa47e479 Merge pull request #12931 from Citadel-Station-13/silicons-patch-61 
nerfs parrying bullets with a wooden stick following complaints
 2020-07-28 21:45:36 -05:00
Artur
e0d9c7972d Makes it actually work 2020-07-29 01:50:40 +03:00
silicons
ab67ae3291 Merge pull request #12951 from timothyteakettle/haha-yes-blood 
bloodsucker blood loss fix
 2020-07-28 13:26:07 -07:00
Artur
09f2594c37 Plugs bloodsucker LifeTick into BiologicalLife 2020-07-28 22:58:13 +03:00
silicons
c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons
78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons
4ab175d812 sigh 2020-07-28 12:10:34 -07:00
silicons
c720e800df whew! 2020-07-28 12:08:02 -07:00
silicons
6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
silicons
a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work 
aliens can remove embeds now
 2020-07-28 10:45:31 -07:00
Timothy Teakettle
c8960624d3 sorry artur 2020-07-28 18:37:01 +01:00
silicons
475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb 
tail wagging fix
 2020-07-28 10:15:17 -07:00
Timothy Teakettle
72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
silicons
ffcfd21613 fix 2020-07-27 14:24:10 -07:00
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons
67b518bf42 experimental 2020-07-27 13:09:54 -07:00
Timothy Teakettle
8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01:00
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb 
tidies up species files
 2020-07-26 22:52:00 -07:00
BlackMajor
dd6fefa43e Merge pull request #12917 from Citadel-Station-13/silicons-patch-57 
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
 2020-07-27 13:20:38 +12:00
BlackMajor
5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom 
removes zoomba/roomba borg sprites
 2020-07-27 13:00:17 +12:00
silicons
308c52df00 ok 2020-07-26 17:14:38 -07:00
silicons
0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons
349874e512 haha 2020-07-26 16:49:47 -07:00
silicons
3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00