cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 11:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,916 Commits 61 Branches 14 Tags
d14fec2f4f50463bb700db56ef7302482d30c607
Commit Graph

453 Commits

Author SHA1 Message Date
phil235
9b90645cec Merge pull request #9199 from TheVekter/buggate2015 
Buggate 2015 PART 1: Slimes, drinks, and more!
 2015-04-28 22:01:13 +02:00
phil235
e846b9c21d Merge pull request #9195 from TheVekter/stunofholding 
No longer able to BoH bomb while stunned
 2015-04-28 21:57:07 +02:00
TheVekter
edd3daab24 Fixes #9066, removes description on Noslips 2015-04-27 14:03:51 -05:00
TheVekter
b6191925bd Fixes #9173 2015-04-26 17:59:05 -05:00
phil235
c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences 
Conflicts:
	code/modules/mob/transform_procs.dm
 2015-04-27 00:11:49 +02:00
phil235
2ef588e01d derp 2015-04-25 19:27:20 +02:00
phil235
67a14f4c21 Changed how the bible icon is chosen, it's now done manually by clicking the bible as a chaplain (only work once). 2015-04-25 19:21:32 +02:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235
081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings. 
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
 2015-04-14 13:54:36 +02:00
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
939b5552ad Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake 
Fixes #8529, confirmation check for BoH bombing
 2015-04-08 20:01:35 +02: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
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
20ed6aada5 Merge pull request #8668 from ACCount12/syndieboxes 
Toolboxes & welders update
 2015-04-04 20:57:15 +11: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
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
ACCount12
cda61c1075 Welder&toolboxes update 2015-04-01 10:43:22 +12:00
phil235
0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases 
Adds cigar cases
 2015-03-30 18:47:46 +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
Jordie0608
1fc89cb611 removes soh singulo interaction 2015-03-26 13:19:56 +11:00
Jordie0608
a6a9aa8a89 adds some sanity checks 2015-03-25 18:03:48 +11:00
Jordie0608
a5396f320a confirmation check for boh bombing + soh also makes singulo 2015-03-25 17:29:43 +11:00
Jordie
59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade 
Adds a cyborg upgrade module for the satchel of holding.
 2015-03-24 16:40:52 +11:00
Razharas
2271499db7 Merge pull request #8058 from Iamgoofball/explosive 
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
 2015-03-21 09:54:11 +03:00
Iamgoofball
7114d5ac04 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm
 2015-03-14 20:00:35 -07:00
CandyClownTG
87f0f44112 Update fancy.dm 
Replaced Doctor's Delight with Omnizine to make Syndicate Smokes useful again.
 2015-03-14 21:20:33 -04:00
Cheridan
3b89c07cd3 Merge pull request #8259 from phil235/BibleBookBagBug 
Fixes book bags not being able to hold bibles and looking like backpacks
 2015-03-13 12:51:10 -05:00
Mandurrrh
fb099a64e7 Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade. 2015-03-12 23:26:02 -04:00
Remie Richards
751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
phil235
4f6c96235b Fixes book bags not being able to hold bibles. 
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
 2015-03-09 21:13:01 +01:00
Iamgoofball
e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
 2015-03-08 14:26:52 -07:00
Xhuis
0be7709d92 Adds cigar cases; sprites by Nienhaus 2015-03-06 23:16:05 -05:00
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Xhuis
2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-03-02 13:45:15 +01:00
Iamgoofball
01b733b2a2 changes and tweaks 2015-02-28 22:13:11 -08:00
Iamgoofball
b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
TheVekter
b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06:00
TheVekter
abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
phil235
809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
phil235
bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Razharas
55208e408d Merge pull request #7419 from paprka/beltoveray 
adds a simple overlay system for belts
 2015-02-20 07:06:20 +03:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
paprka
88760896ad initial commit 2015-02-13 20:59:39 -08:00
Cheridan
65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
xxalpha
1b24461841 Fix syndicate briefcase not having cash. 
Fix returns, fix everything.
 2015-02-09 18:06:20 +00:00