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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,341 Commits 55 Branches 0 Tags
bf562de84ec84c7accc0cd1e428c7b51aee2c06c
Commit Graph

179 Commits

Author SHA1 Message Date
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs 
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
 2019-10-29 21:29:12 -07:00
kevinz000
4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269 
Unmodularize vox sounds
 2019-10-25 20:09:52 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
Ghommie
0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit 
properly ports neovgre from hippie
 2019-10-21 21:17:57 -04:00
YakumoChen
37481b681a Delete gatling.ogg 2019-10-20 03:10:36 +00:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
Poojawa
49ee9af897 metadata because people are throwing a fit about it 2019-10-17 01:30:47 -05:00
deathride58
b3a81dce01 Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs 2019-10-14 18:18:32 -04:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Fermi
797dcfc1e3 ahaha 2019-10-02 10:08:45 +01:00
Sishen
f3d373a6b8 loose goose 
honk honk
 2019-10-02 02:27:30 -04: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
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
nik707
0a4090f4d3 Merge pull request #9080 from Thalpy/Newmusic 
Adds 3 new Copyright compatible space-y music tracks to title
 2019-08-29 18:23:47 -05:00
Sishen
b98a5016b3 aaaaaaaaaaaa 2019-08-29 01:56:52 -04:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Sishen
20f4e260e1 minigun ooga 2019-08-23 19:39:20 -04:00
Fermi
5764041835 Adds new title music! 2019-08-08 17:25:40 +01:00
Ghommie
23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
EgoSumStultus
54f10b780c HHUUUUHGHUGHUGHGH!! 2019-08-02 07:35:59 -07:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
kevinz000
1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101 
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
 2019-07-07 02:39:07 -07:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
Sishen
a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie
138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Fermi
a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01:00
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB 
Ports new footstep sounds from base /tg/
 2019-05-25 11:30:57 -07:00
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Nero1024
752f368ed2 Ports additional footsteps 
And actually make it all compile.
 2019-05-17 19:12:22 -05:00
Nero1024
2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
deathride58
2ed9045173 Merge pull request #8164 from Poojawa/vore-mechanic-fixes 
[Ready] Vore interactions, feeding, UI cleanup!
 2019-03-31 21:19:20 -04:00
Zandario
7877cadcad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into zandario-sound-overhaul 2019-03-29 14:28:31 -05:00
Zandario
30ff894398 Adds PDA Sounds 
Adds new sound files and gives the PDA life!
 2019-03-29 14:18:34 -05:00
Poojawa
d4503e77de Chance for quiet belly growls if HONGRY 2019-03-27 10:58:38 -05:00
Ragolution
286662be52 Adds new round-end sound. 
Bye, have a beautiful time. https://www.youtube.com/watch?v=cepZIk0PlvM
 2019-03-18 08:52:35 -04:00