cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,701 Commits 61 Branches 14 Tags
e2c869bc7732ba8e94fa20dcb26b97541d8bc794
Commit Graph

1224 Commits

Author SHA1 Message Date
phil235
4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	icons/obj/food.dmi
 2015-04-09 17:38:14 +02:00
phil235
06f09fcd81 Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard 
Icon_door customability fix
 2015-04-09 14:27:30 +02:00
Jordie0608
a405022ac9 State fixes 2015-04-09 16:27:39 +10:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
 2015-04-08 19:36:49 +02:00
Jordie0608
24d047a116 icon_door customability fix 2015-04-09 00:05:16 +10:00
Cheridan
f537b43108 Merge pull request #8789 from phil235/BeartrapFix 
Pull, resist, beartraps
 2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
 2015-04-08 22:51:45 +10:00
Jordie0608
ffbef1f7d9 inversed check fix 2015-04-08 16:22:51 +10:00
Jordie0608
60cf76c881 fixes 2015-04-08 16:11:56 +10:00
Jordie0608
37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
phil235
6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix 
Conflicts:
	code/modules/mob/living/living.dm
 2015-04-07 20:27:37 +02:00
phil235
1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
 2015-04-06 19:38:51 +02:00
phil235
8499413649 Makes living/verb/resist more object oriented. 
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
 2015-04-06 18:45:37 +02:00
phil235
f9f618d699 Adding the chemical reactions and recipes for the new recipes. 
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
 2015-04-04 19:29:12 +02:00
Jordie
3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus 
Cyber Implants +
 2015-04-04 20:57:48 +11:00
xxalpha
7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235
493c3e038a Splitting food.dmi into smaller files. 
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
 2015-04-03 21:59:56 +02:00
Remie Richards
862657bd7c Merge pull request #8421 from dannno/guncases 
gun lockers
 2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales
1f94f2fe27 Update guncase.dm 
change 4 to capacity
 2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales
8de848eccb Update guncase.dm 2015-04-03 13:16:25 -04:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
dannno
4051efc3a9 Proper UI for gun lockers 2015-03-31 12:54:24 -04:00
Jordie
005c519b94 Merge pull request #8622 from phil235/TableclimbKnockFix 
Fixes tableclimber knocking themself off the table when clicking it mid-climb
 2015-03-31 22:06:51 +11:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
Cheridan
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing 
Fixes alien nest buckling
 2015-03-31 00:06:14 -05:00
phil235
12a729adcd Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living. 
Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.
 2015-03-30 23:14:21 +02:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion! 
Space cash is stacks
Adds dealer table to map
 2015-03-29 18:09:54 -05:00
phil235
0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
phil235
2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free. 
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
 2015-03-28 23:02:44 +01:00
phil235
e80a50f1c7 Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand. 2015-03-28 00:12:06 +01:00
phil235
1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
dannno
d45b0aa656 improved gun case code 2015-03-25 12:01:06 -04:00
Jordie
fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer 
Instrument tweaks
 2015-03-25 16:29:29 +11:00
hornygranny
506da51f96 Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones 
Adds click delay to smacking up statues
 2015-03-23 16:31:53 -07:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Nienhaus
9486248553 Merge pull request #8440 from dannno/coperite 
GAR GLASSES
 2015-03-22 12:05:21 -05:00
MrPerson
2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
Jordie
d361649df5 Merge pull request #8369 from pudl/retardfix 
normal sec headset
 2015-03-21 17:23:18 +11:00
Incoming
5861b643b6 Adds click delay to smacking up statues. Fixes #8313 2015-03-20 23:50:25 -04:00
MrPerson
fa7a89b25b Instrument tweaks 
The piano will stop playing once you walk away from it or get stunned.

The song BPM of the piano and violin will generally speaking be wrong because of discrepancies between the sleep between notes and world.tick_lag. I've solved this by locking BPM to points where the stated BPM will actually be the case because tempo == world.tick_lag.

Example
Current:
song @ 5 tempo - 120 BPM: c, c/2, c -> note -> sleep(5) -> 6 ticks (5.4 time passes) -> note -> sleep(2.5) -> 3 ticks (2.7 time passes) -> note.

With this PR:
song @ 5.4 tempo - 111 BPM: c, c/2, c -> note -> sleep(5.4) -> 6 ticks (5.4 time passes) -> note/2 -> sleep(2.7) -> 3 ticks (2.7 time passes) -> note.

I was hoping this would make the damn things sound better but then I realized it wasn't actually messing anything up. Oh well.
 2015-03-20 20:40:36 -07:00
phil235
aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
xxalpha
c25576ad6a Merge remote-tracking branch 'upstream/master' into catwalkmachines 
Conflicts:
	code/game/objects/structures/lattice.dm
 2015-03-20 17:02:00 +00:00
Swag McYolosteinen
7d17c54555 Merge pull request #8411 from xxalpha/cablefix 
Fixes cables being destroyed when creating plating out of catwalk space.
 2015-03-20 17:45:36 +01:00
Swag McYolosteinen
d95209a5df Merge pull request #8391 from Incoming5643/Statue_of_limitations 
Fixes invincible unstoppable death statues
 2015-03-20 17:43:22 +01:00
dannno
29477dfccc adds GAR glasses of various flavors 
you're welcome
 2015-03-20 01:29:54 -04:00
dannno
88e3bb1dc6 generalized procs for gun lockers 2015-03-19 16:23:06 -04:00
Jordie
e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking 
Allows alt-clicking for some stuff
 2015-03-19 16:43:53 +11:00
Cheridan
a66018cb4b Adds collar to HoP closet 2015-03-19 00:18:56 -05:00