cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-30 19:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,993 Commits 59 Branches 14 Tags
64c19bd2d3c95b0e27bd7112ca679779eaba407b
Commit Graph

454 Commits

Author SHA1 Message Date
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Jack Edge
7f49175967 Renames files under code/ with naughty characters 
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
 2016-05-24 12:16:19 +01:00
Shadowlight213
86cbe14d15 Conflict fixes 2016-05-19 20:42:26 -07:00
Shaps
cbc7a8b654 Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626) 
* Actually fixes announcements the right way

* Flips the SOUND_ANNOUNCEMENTS bitflag so that having it means you hear announcements

* Updates the save file version
 2016-05-14 00:55:50 +02:00
AnturK
b9304901c6 Merge pull request #17435 from Shadowlight213/volumefix2 
Removes volume control for admin midis
 2016-05-13 19:31:04 +02:00
Shadowlight213
6191cf0add Merge conflict fix 2016-05-08 16:43:51 -07:00
Joan Lung
c028be9c9c Merge pull request #17382 from Incoming5643/badmins_doing_shit 
Fixes var editing clients
 2016-05-06 20:00:03 -04:00
Shadowlight213
afb7a878d1 Fixes merge conflicts 2016-05-06 16:52:30 -07:00
Shadowlight213
9c5733d374 Removes volume control for admin midis 2016-05-06 15:36:02 -07:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Incoming
299f2b0d02 clients aren't datums so I'm forced into this slightly scummy situation. If at some point in the future byond makes clients datums this will need to be reverted. 2016-05-04 12:14:30 -04:00
Shadowlight213
0ccc96f2b8 More WIP with changing to species. 2016-04-29 13:10:26 -07:00
Razharas
d8232cbf33 Revert "Adds player preference to hide irrelevant tablecraft recipes" 2016-04-29 17:47:31 +03:00
Razharas
7b49961371 Merge pull request #16978 from nullbear/tablecraft-tweak 
Adds player preference to hide irrelevant tablecraft recipes
 2016-04-29 15:26:14 +03:00
Shadowlight213
ece8e79550 Merge branch 'master' of https://github.com/tgstation/-tg-station into Archangel 2016-04-28 15:31:02 -07:00
Joan Lung
d9bc4e0040 Merge pull request #16914 from MrStonedOne/clientversionconfig 
Adds a config for client versions
 2016-04-27 19:29:11 -04:00
Kyle Spier-Swenson
c3bcf0adfc Adds a download link. 2016-04-26 01:43:48 -07:00
Shadowlight213
6d6e9818cb More WIP 
Initial work on spacemove in atmosphere
Getting stunned now launches you and doubles the stun.
 2016-04-24 17:41:10 -07:00
KorPhaeron
c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
Shadowlight213
303bdec6f5 Angel WIP commit 1 
Added basic angel wing Mutant parts
 2016-04-22 13:36:43 -07:00
nullbear
b8a5871f84 Gets rid of the config portion of this UI 2016-04-19 09:10:25 -07:00
MrStonedOne
859714bfe6 Adds a config for client versions 2016-04-16 07:56:41 -07:00
Shadowlight213
ab25f840e9 Adds detecting newly made byond accounts (#16269) 
* Adds age checking for byond accounts.

* WIP. moved to regex.

* Actually works now.

* local vars

* Changes to use sql.

* Fixes

* Removes unused var
 2016-04-15 11:04:52 +10:00
Remie Richards
984afed89f Adds a priority system for client.color effects 2016-04-07 21:55:31 +01:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
duncathan salt
3315717ef9 Merge pull request #16348 from Shadowlight213/adminsoundvolume 
Adds client volume control for admin sounds.
 2016-03-31 11:59:52 -06:00
Ricotez
8d84097d50 Fix Preference toggles and button name. 
+Fixes a bug where using the buttons in the Preference menu to change your Ghost Accessories or Ghosts of Others preference wouldn't save to your savefile.
+Changes the name of the "Ghost Display Settings" preference toggle to "Ghosts of Others" to fit in line with what the preference is called in the code and in the setup window.
 2016-03-28 03:29:31 +02:00
Cheridan
b2fec069f0 Merge pull request #16225 from Ricotez/ghostlooks 
Ghosts with hair.
 2016-03-26 21:03:44 -05:00
Cheridan
004e59864a Merge pull request #16261 from Core0verload/pda_close 
Kills snowflakey PDA close button
 2016-03-26 14:30:07 -05:00
Incoming
1a61c5f4ec Removes the human biases from preferences code. You can now run stations without any humans if you want. 
Caveat: All humanized monkeys will still be human, I tried to fix this but thanks to what seems to be a race condition doing so made roughly 50% of all humans drop dead at the first life tick.

Updates the race list in game_options.txt. Our servers don't auto update config files, so this is just for anyone who makes a server going forward.
 2016-03-25 00:26:18 -04:00
Shadowlight213
23b3f77448 Adds volume control for admin sounds. 2016-03-24 21:19:51 -07:00
Ricotez
ae6faabd8a Brighter ghost hair and new preferences. 
+Ghost hair is now brighter than before.
+Added a new preference ghost_accs that stores what you want your own ghost to display.
+Added a new preference ghost_others that stores what you want other people's ghosts to display.
 2016-03-23 20:41:36 +01:00
c0
2b6128d56e Kills PDA snowflakey close button 2016-03-21 07:38:33 +03:00
Ricotez
17caf2d320 +When the default ghost sprite is selected, and your species has head and/or facial hair, your ghost sprite will have the same hair. 
+If you ghost in the round, this will base itself on the body you occupied.
+If you observe, this will base itself on the character you had active when you hit the button.
 2016-03-20 00:45:54 +01:00
tkdrg
4cf728cd5e Merge pull request #15642 from AnturK/random_things 
Minor fixes
 2016-02-21 10:21:13 -03:00
Tkdrg
4390482fac Merge branch 'Shadowlight213-Soundflip' into HEAD 
Closes #15502
 2016-02-20 16:00:11 -03:00
Shadowlight213
07565ffaa5 Reverses Announcement sound pref to hopefully fix it starting off. 2016-02-20 15:59:15 -03:00
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
KazeEspada
5d8d5854f9 Bag tweaks. 
Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
 2016-02-16 14:03:35 -07:00
Remie Richards
3cf176610e Fixes old species conversion code being incorrect 2016-02-13 02:06:03 +00:00
Remie Richards
8c9c061bd0 Adds auto conversion of older backbag options to the new options. 
Fixes erroneous indenting of species correction (Species correction should happen in ALL versions, not just those below version 9
 2016-02-12 00:27:30 +00:00
Remie Richards
44b2344925 Merge branch 'backpackssatchelsdufflebagsohmy' of https://github.com/KazeEspada/-tg-station into fucking_kaze 2016-02-12 00:13:03 +00:00
KazeEspada
42a3ace123 Makes it so a bad savefile(IE: an old one) uses the default backpack. 2016-02-11 17:05:16 -07:00
KazeEspada
653902068e You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags. 
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
 2016-02-11 16:48:08 -07:00
duncathan salt
933baf5943 Merge pull request #15229 from Shadowlight213/Muteall 
Adds a preference to mute Centcom, alert level, and VOX sounds
 2016-02-10 21:34:30 -06:00
AnturK
e93fbcd2a0 Cleanup 2016-02-10 16:30:43 +01:00
AnturK
a1583f24ae Buildmode Refactor 
Adds generic click intercept to clients
 2016-02-10 16:29:47 +01:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Shadowlight213
57e54d4c78 Adds a preference to mute Centcom, alert level, and VOX sounds 2016-02-05 21:41:16 -08:00
tkdrg
d188447041 Merge pull request #15121 from neersighted/hotkeys 
Add hotkey preferences
 2016-02-05 14:52:34 -03:00