cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,033 Commits 61 Branches 14 Tags
b63b7e528abd3dfe0f4329cdad25cced6d7dcd7a
Commit Graph

3913 Commits

Author SHA1 Message Date
hornygranny
881fd8eaee Merge pull request #6223 from Ergovisavi/back_slot_toggle_items_fixes 
Fixing issues and updating equip method for Watertank Backpack / Defib
 2014-12-15 16:24:58 -08:00
hornygranny
a1f263ec67 Merge pull request #6364 from phil235/DefibMessageColorFix 
Changes defibrillator success/failure messages color
 2014-12-15 16:18:42 -08:00
hornygranny
56ddfc1367 Merge pull request #6331 from tkdrg/weews 
Fixes disappearing alien weeds overlays
 2014-12-15 14:24:25 -08:00
Cheridan
024817b0b2 Merge pull request #6154 from phil235/ClosetResistFix 
Fixes not being able to get out of a wrapped closet by resisting
 2014-12-15 02:53:33 -06:00
Cheridan
b143e41b88 Merge pull request #6265 from Miauw62/HOHOHO 
SANTA IS COMING TO STATION
 2014-12-14 23:58:28 -06:00
Cheridan
f9eacb4498 Merge pull request #5854 from A4Brogan/Ghetto_Banana_Lamp 
Ghetto Banana Lamp
 2014-12-14 23:51:18 -06:00
Cheridan
7491cc38f7 Merge pull request #6346 from TZK13/Chemical-Closet-Sprites 
Adds distinct sprites for the chemical closet
 2014-12-14 23:21:04 -06:00
phil235
027ce2a1df Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure. 2014-12-14 17:32:03 +01: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
0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
Razharas
bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8 
Security aesthetic overhaul
 2014-12-14 07:57:33 +03:00
TZK13
0df50e5c6e Adds distinct sprites for the chemical closet. 2014-12-13 22:04:43 -06:00
paprka
3bd3175a18 Removed unused armbands 2014-12-13 00:14:03 -08:00
paprka
40943d5684 reverts some sechailer and other feature things 2014-12-13 00:09:58 -08:00
Cheridan
c104ad6cd4 Merge pull request #6323 from AndroidSFV/fix6313 
Fixes 6313
 2014-12-12 23:01:43 -06:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
paprka
868f29ada7 reverts armband change 2014-12-12 10:53:35 -08:00
tkdrg
621d3d936a Fixes disappearing alien weeds overlays 
I have no idea why this works.
Fixes #6326
 2014-12-12 14:29:32 -03:00
AndroidSFV
3a0927febd Fixes 6313 2014-12-12 11:16:54 -06:00
Hornygranny
98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/mecha/mech_fabricator.dm
 2014-12-11 13:53:37 -08:00
paprka
76f7765c7b lockers for boxes 2014-12-11 12:13:13 -08:00
paprka
e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
Cheridan
27793609d8 Merge pull request #6201 from fleure/togglefix 
Fixes toggling watertank nozzle in hands with verb
 2014-12-11 12:21:32 -06:00
Cheridan
3ede77face Merge pull request #6189 from Menshin/exofab_revamp_end+fixes 
Exofab revamp finishing and fixes
 2014-12-11 11:52:16 -06:00
Cheridan
2619beccdf Merge pull request #6270 from optimumtact/iflashedu 
Fix flash messages when failing to flash
 2014-12-11 06:35:29 -06:00
Razharas
f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening 
Guns: the gunnening
 2014-12-11 10:46:34 +03:00
hornygranny
7d83830365 Merge pull request #6268 from tkdrg/yum 
Changes weed overlay border layer to match weeds
 2014-12-10 16:55:13 -08:00
Cheridan
ece2bb00c3 Merge pull request #6242 from Dorsisdwarf/RCDbuff 
Buffs the RCD
 2014-12-10 06:23:28 -06:00
Hornygranny
99f364f480 makes APC call parent 2014-12-09 18:53:29 -08:00
Hornygranny
f34fcd6124 overrides attack 2014-12-09 18:10:17 -08:00
Hornygranny
72132b1bf1 fixes whitespace 2014-12-09 16:32:16 -08:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Cheridan
d529235696 Merge pull request #6187 from phil235/GrilleWindowFix 
Fixes being able to place multiple fulltile window on a grille.
 2014-12-09 12:51:05 -06:00
Razharas
0b32dc97a7 Merge pull request #6136 from optimumtact/patch-3 
Grille throwforce is now halved against grilles, instead of -5
 2014-12-09 05:31:32 +03:00
oranges
41f0d0e04f Fix flash messages when failing to flash 
It would give the success message when flashing carbons even if the flash
had actually failed to work
 2014-12-09 09:38:26 +13:00
tkdrg
bce24d96c9 Changes weed overlay border layer to match weeds 
Fixes #6237
 2014-12-08 15:47:59 -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
Miauw
12279d9c8e Adds a santa event where a dead player is spawned as Santa! HO HO HO! 
Also adds a few more things to the random gifts.
 2014-12-08 17:03:52 +01:00
Swag McYolosteinen
b828448645 Merge pull request #6228 from paprka/coatscoats 
Adds winter coats and changes labcoat toggling
 2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
paprka
bf207efa9a santa hats for sec and sprite tweak 2014-12-07 20:22:54 -08:00
paprka
c158599253 Christmas santa hats! 2014-12-07 20:02:03 -08:00
Dorsisdwarf
65bdf75fc0 Adds changelog and nerfs door deconstruction. 2014-12-07 11:46:59 +00:00
paprka
89c1469b06 updates metastation for winter coats, tweaks spawning, tweaks santa hat 2014-12-06 23:00:34 -08:00
Remie Richards
9368500614 Merge pull request #6208 from tkdrg/wooh 
Fixes ausbushes icon_state for the subclasses
 2014-12-06 23:56:51 +00:00
Remie Richards
eeea775d67 Merge pull request #6188 from tkdrg/miauwpls 
Fixes the new AI lawcap config option
 2014-12-06 23:55:15 +00:00
Razharas
cd218a7ba3 Proper handling of computers and tables by c4 
Proper handling of computers and tables by c4
 2014-12-06 21:44:52 +03:00
Dorsisdwarf
931bddc657 actually fixes the description 2014-12-06 11:41:35 +00:00
Dorsisdwarf
77106e033b Updates description and capacity variable 2014-12-06 11:38:15 +00:00
Dorsisdwarf
6149d834f7 Buffs the RCD 2014-12-06 11:24:13 +00:00