cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,613 Commits 61 Branches 14 Tags
8f53dcbfb0b7ed5ebded784db309aae1b002a623
Commit Graph

168 Commits

Author SHA1 Message Date
TZK13
bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks 
Conflicts:
	config/admins.txt
 2015-01-03 07:07:03 -06:00
MrStonedOne
2bb2469038 Fixes error with logging admin rank changes to the user's database record. 
I forgot to add a field to the query in commit 138567b7cf when I modified it.
 2014-12-31 23:19:43 -08:00
tkdrg
3752254766 Revert "Adds mouse pointers for different ui styles" 2014-12-31 02:17:50 -03:00
tkdrg
78e5b9e7c7 Merge pull request #6616 from paprka/pointerpride 
Adds mouse pointers for different ui styles
 2014-12-29 16:47:07 -03:00
paprka
2e8907ed4c adds a preference for custom pointers 2014-12-28 18:13:48 -08:00
TZK13
674aa40115 More adjustments to the width and height of the preferences screen. 2014-12-23 07:08:58 -06:00
TZK13
8654c06b90 Increases height of preferences screen. 2014-12-22 21:02:20 -06:00
TZK13
127aabbfa9 Adds socks as an underwear option. 2014-12-22 19:27:46 -06:00
tkdrg
9d7567f46d Adds cfg option to let players see their own notes 
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
 2014-12-19 22:42:18 -03:00
tkdrg
4da919ce75 Fixes assistant jobban bug 
Assistant-banned people who had assistant set to 'Yes' were unable to
pick their job preferences.
 2014-11-27 16:51:15 -03:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl 
Nanotransen Relay Chat
 2014-11-03 17:26:53 -08:00
hornygranny
d79ccb4883 Merge pull request #5608 from tkdrg/whynamesandnotbodies 
Creates the "Always use random body" option
 2014-11-03 17:16:08 -08:00
Cheridan
2fefe79c1f Merge pull request #5599 from phil235/CharScreenWindowFix 
Fix the character setup window's size
 2014-11-03 10:39:32 -06:00
tkdrg
30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl 
Conflicts:
	code/modules/research/message_server.dm
 2014-11-01 20:04:26 -03:00
tkdrg
8a93247ef8 Creates the "Always use random body" config option 2014-11-01 16:48:42 -03:00
phil235
e00feb8f1f Fix the character setup window's size 2014-11-01 16:18:23 +01:00
Remie Richards
3d3521654f Merge pull request #5497 from tkdrg/dingdongbannudesu 
Assistant jobbans now ban people from using "Be assistant"
 2014-11-01 03:42:50 +00:00
Swag McYolosteinen
4e7cb0eb01 Merge pull request #5530 from MrStonedOne/fukkinreallyerro 
[MSO] Minor sql improvements.
 2014-10-30 21:00:42 +01:00
MrStonedOne
6f0666138a Ensures spawned proc is never called if the client goes away 2014-10-29 18:02:21 -07:00
MrStonedOne
138567b7cf Removes some sql related lag caused by too many clients connecting at once after a restart 
(and other minor fixes to client sql logic)

Clients will now spread out their sql database connection logging and related ckey by ip/cid searching at world start so it doesn't all happen at once.
Fixes a minor bug with related ckey searching where only one would be returned.
Fixes a minor bug where related ckey searching would return the client's own ckey.
 2014-10-29 04:15:46 -07:00
MrStonedOne
8a064ee545 Removes extra sql sanitize procs in favor of sanitizeSQL() 2014-10-29 04:12:07 -07:00
tkdrg
90d9dddf39 Merge remote-tracking branch 'upstream/master' into hiasl 
Conflicts:
	code/modules/client/client procs.dm
 2014-10-29 01:27:08 -03:00
tkdrg
562e0449fa Assistant jobbans now keep people from using Assistant as a fallback job. 2014-10-27 15:49:23 -03:00
tkdrg
314617ea6d PDAs now have a Nanotransen Relay Chat client 2014-10-27 11:22:40 -03:00
GunHog
20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition 
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
 2014-10-21 18:06:04 -05:00
paprka
18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2 
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
 2014-10-08 09:48:49 -07:00
ikarrus
30d6e01a5f Fixes Character Saves not remembering Species 
It now saves the name of the species instead of a reference.
 2014-09-28 19:42:17 -06:00
Remie Richards
cc85f44ccb Merge pull request #4900 from MrStonedOne/erroageinjudgement 
Fixes some "erros" in the database system
 2014-09-26 23:41:37 +01:00
GunHog
589c1f4cbb Botcall, TG edition! 2014-09-25 09:44:41 -05:00
MrStonedOne
e21ed011af Fixes some erros in the database system 
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
 2014-09-19 13:37:58 -07:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Cheridan
2fb2e902dc Merge pull request #4726 from Miauw62/sensualwhispers 
Adds a separate preference for whispers.
 2014-09-16 12:42:13 -05:00
ikarrus
399d2844e5 ENFORCE_HUMAN_AUTHORITY now only applies to Command positions 
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
 2014-09-07 22:33:56 -06:00
Miauw
65c963c109 Adds a separate preference for whispers. Fixed #4658 Fixed #4712 2014-09-07 14:29:58 +02:00
ikarrus
bae6578055 Config Option to Bar Lizards from Authority Roles 
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
 2014-09-05 22:44:05 -06:00
Cheridan
e0d171e7bf Merge pull request #4483 from ChuckTheSheep/direct-intent 
Direct intent clicking (redo)
 2014-08-31 11:25:47 -05:00
ikarrus
51a333ebe7 Merge gang mode into latest version 2014-08-30 23:31:44 -06:00
ikarrus
4c801434a8 Gang Mode 2014-08-30 23:17:14 -06:00
Alex
be25e5b9e4 Merge pull request #4511 from Limeliz/char-setup 
Scroll through hair styles and facial hair
 2014-08-24 12:59:40 +01:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
Limeliz
98331d4399 Scroll through hair styles and facial hair 
Adds < and > buttons to character setup screen to easily scroll to next
or previous hair style and facial hair, intead of opening the popup with
a long unsorted list.

Also adds two procs for returning the value of the previous or next
index in a list.
 2014-08-21 02:32:09 +02:00
ChuckTheSheep
c1d98ba7ae Did I do it right? 2014-08-19 18:15:11 -04:00
paprka
5210419a87 undershirts 2014-08-11 22:41:07 -07:00
Aranclanos
12242cad7d Removes the unused and useless warn button on the player panel. 2014-08-06 03:43:28 -03:00
Cheridan
3612a9a8a0 MONKEY MODE: "IT ACTUALLY WORKS" EDITION 
Probability support for monkey mode.
Player config support for monkey mode.
Check Antags support for monkey mode.
 2014-07-08 22:55:47 -05:00
CollenN
3a0e81f7f3 OKAY WHOOPS I LIED 
THIS corrects pre-existing black mutantcolors.
 2014-06-22 20:31:21 -04:00
CollenN
5e70ab0f98 Fixes accidental parenthesis 
I accidentally put that one in after I'd already compiled, and didn't
catch it until after I published.
 2014-06-22 20:20:49 -04:00
CollenN
6571767caa Fixes black lizardmen 
Everyone whose mutant color is set to black is now instead white.

Also, now black mutantcolors are automatically set to the default color
of your species if you select them.
 2014-06-22 20:19:02 -04:00
CollenN
9d1659219e Encapsulates if() statement 
Profakos pointed this out
 2014-06-20 06:52:58 -04:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update 
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
 2014-06-19 17:42:14 -04:00