cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 15:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

421 Commits

Author SHA1 Message Date
Swag McYolosteinen
495604228c Merge pull request #6455 from paprka/bayports 
Ports manifest / better ready button(s)
 2014-12-24 11:54:40 +01:00
TZK13
615507737a Makes the "black" undershirts actually black, adds a few new undershirts and adds myself to the admins.txt. 2014-12-24 02:11:41 -06:00
TZK13
127aabbfa9 Adds socks as an underwear option. 2014-12-22 19:27:46 -06:00
paprka
2371e2ebd8 renames chef to cook 2014-12-22 17:02:06 -08:00
paprka
adc09ffe41 initial commit for bay ports 2014-12-17 23:42:09 -08:00
paprka
4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
tkdrg
dc654e74db Removes white ian undershirt 
As requested by the head coders. Too many ian shirts.
 2014-12-14 15:21:28 -03:00
tkdrg
b983176937 Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-14 11:59:45 -03:00
Razharas
d61ecfa324 Merge pull request #6181 from GunHog/Autosay_Fix 
Lets AI and Borgs control radio behavior for auto announcements.
 2014-12-09 01:16:48 +03:00
tkdrg
4237c406e4 Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
 2014-12-08 13:53:31 -03:00
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
GunHog
6ac3d8f2e8 Lets AI and Borgs control auto announcements 
The AI and cyborgs can now control if they speak on the radio and the
channel used when stating laws or  (AI only) announcing new player
arrivals.
 2014-12-02 11:43:36 -06:00
tkdrg
35cbf8918e Adds new undershirts, jeans and pants by WalterJe 
Adds the undershirts by JStheguy

Ports some pants by JStheguy from NTstation

Ports the clothes vending machine from NTstation

Adds the clothesmate restock icon by WJohnston
 2014-11-23 13:58:32 -03:00
TZK13
109076dc63 Updates labcoats in the preferences setup screen to appear closed and changes the lawyer's shoes to be lace ups instead of brown. 2014-11-09 19:30:33 -06:00
hornygranny
38b4f50e3e Merge pull request #5630 from GunHog/Soft_Silky_Hair 
Adds three new hairstyles by Mandurrrh!
 2014-11-03 17:37:55 -08:00
GunHog
a9c5667ab6 Adds three new hairstyles! 
-Adds the High Ponytail, Long Ponytail, and Long Side Part hairstyles!
 2014-11-02 18:06:53 -06:00
tkdrg
8a93247ef8 Creates the "Always use random body" config option 2014-11-01 16:48:42 -03:00
TZK13
4c5dcb4ae9 Changes the preview satchel for the CMO, MD and virologist from norm to med. 2014-10-18 04:55:40 -05:00
TZK13
3cff2fcbdd Fixes the previews in the character setup screen. 2014-10-18 04:30:10 -05:00
paprka
c83592263b Revert removal of kinky underwears 
w/e
 2014-10-15 12:30:36 -07:00
paprka
69bbeb6815 underwear updates 2014-10-14 15:02:06 -07:00
paprka
67dd029fe0 updated sprites, grey stuff 2014-10-08 10:38:24 -07:00
paprka
b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07: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
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
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
Aranclanos
891a9d0568 Fixed the overeye hair, now it should display properly instead of an 'error' message. 2014-09-17 02:37:51 -03: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
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
quiltyquilty
62d62a28cd fixes what aran told me to fix 2014-09-04 17:36:27 -05:00
quiltyquilty
ae7f0cb6fa returns glorious ponytail 2 2014-09-03 19:14:21 -05:00
quiltyquilty
8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
quiltyquilty
4c079bf65b more epic fixing 2014-09-02 17:26:39 -05:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say() 
[READY] Saycode rewrite
 2014-08-31 10:59:04 -05:00
Tokiko1
4ef3beb454 Testing 2014-08-31 14:25:32 +02:00
Tokiko1
ba20a875a0 Should fix merge conflicts 2014-08-31 14:22:56 +02:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
Alex
15c6e99801 Merge pull request #4607 from Ikarrus/removelobbymeta 
Only Admins can see Ready Players in Lobby
 2014-08-31 12:29:16 +01:00
Alex
14b03b5db5 Merge pull request #4569 from quiltyquilty/hairs 
organizes various hairstyles
 2014-08-30 20:01:55 +01:00
ikarrus
6d79ac49d1 Only Admins can see Ready Players in Lobby 
Removes a lot of potential metagaming by stopping players from counting or remembering who readied up during the lobby.
 2014-08-29 21:49:44 -06:00
quiltyquilty
b344431648 enforces consistency 2014-08-27 18:08:08 -05:00
quiltyquilty
0739769acb does what giacom told me to do 
renames some hairs
adds a few more that snapwalk made
 2014-08-27 17:46:47 -05:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
quiltyquilty
b575eb93bf organizes various hairstyles 
this organizes several of the 25 hairstyles goof added. additionally, it changes the names of Bun Head and Twin Buns to Bun Head 1 and Bun Head 2. the Ramona haircut (that i made, so it's ok :)) has been modified because it did not fully work in game, and its name has been changed to Pixie Cut to avoid the spvtw reference.
 2014-08-25 06:51:41 -05:00
Tokiko1
e62e541860 Adds two new hairstyles, both variations of the himecut. 2014-08-23 11:47:41 +02:00
iamgoofball
6fc3974228 fixes 2014-08-19 15:58:13 -07:00
iamgoofball
013cf24842 we can now translate the hairstyle names without being a doritos munching mtn dew chugging 4chan pass owner 2014-08-19 15:43:05 -07:00
iamgoofball
5711f4a917 fixes 2014-08-17 14:37:30 -07:00
iamgoofball
eb66b49b70 Adds 25 new hairstyles. 2014-08-17 14:13:42 -07:00
Firecage
35af394b9a Absolute paths for files in the mob folder 2014-08-17 02:45:35 +02:00