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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,298 Commits 55 Branches 0 Tags
95b8cd3956c3375acd3e76589b24082ba0f3d023
Commit Graph

70 Commits

Author SHA1 Message Date
Ghom
bcd911070a Fixing dwarfism. (#12331) 
* Update body.dm

* Update dwarves.dm
 2020-05-21 12:38:42 -07:00
Ghom
6696560656 slendermen fix. (#12303) 
* slendermen fix.

* Whops

* Update dwarfism.dm
 2020-05-20 18:43:14 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghom
a38e6e88a0 Enables hulk smash. 2020-04-10 14:07:39 +02:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
Ghommie
519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03:00
Ghommie
3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
Seris02
332099953b removes xray from the gene pool 2020-03-20 11:15:47 +08:00
Ghommie
4c87f2256c genetics 2020-03-16 02:04:48 +01:00
kappa-sama
29f7c9026f buffies 2020-03-14 22:09:08 -04:00
Ghom
88bdc6d068 Merge pull request #11440 from kevinz000/master_fix 
fixes master
 2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699 Update actions.dm 2020-03-12 01:47:51 +01:00
kappa-sama
80b17cff1f Merge branch 'master' into patch-17 2020-03-11 20:26:13 -04:00
Seris02
067e2e4506 probably fixes hulk 2020-03-09 18:15:12 +08:00
Seris02
9b66940807 fixes the web 2020-03-09 16:27:46 +08:00
kappa-sama
3c7a9f068e downvoted 2020-03-02 13:51:26 -05:00
Seris02
8a647f8a8c happy now? 2020-03-02 04:22:40 +08:00
Seris02
b195783dfb yeet 6 2020-02-28 14:31:47 +08:00
Seris02
8140962275 yeet 4 2020-02-27 21:05:27 +08:00
Seris02
d3385fb8c8 yeet 3 2020-02-27 21:03:50 +08:00
Seris02
a14fe06241 probably fixes it 2020-02-27 20:51:19 +08:00
Seris02
6e6b8fbd8a yeet 2 2020-02-27 20:35:53 +08:00
Seris02
9028169caf fixed? 2020-02-22 20:16:40 +08:00
Seris02
88ae429720 runtime fix 2020-02-22 19:45:57 +08:00
Seris02
84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
Seris02
718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghom
481371bca7 Merge pull request #10193 from Commandersand/yeet 
gamer is now filtered for clowns
 2019-12-20 13:15:54 +01:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
loginsandylogout
6f9be0c863 saves the world 2019-12-15 14:11:44 -06:00
loginsandylogout
0f40db60ce honk 2019-12-15 03:38:00 -06:00
kappa-sama
eb638adfa9 yw ghom 2019-12-09 10:10:14 -05:00
kevinz000
69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207 
Makes smile not as horrable.
 2019-08-11 10:08:45 -07:00
Trilbyspaceclone
7a22e73a79 Update speech.dm 2019-08-06 08:47:10 -04:00
Ghommie
ec560c8371 Ports "More robust dorfs." 2019-07-31 22:14:39 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie
c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
Ghommie
7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00