cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,932 Commits 61 Branches 14 Tags
b3733df367cf0be10e77dfe86cdf0a7ecfa64a13
Commit Graph

345 Commits

Author SHA1 Message Date
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Iamgoofball
10c60a59b1 adds beam sprites @cheridan merge when??? 2015-06-08 19:56:06 -07:00
Iamgoofball
988ff28734 adds panel open icons for the new buildables 2015-06-07 03:55:28 -07:00
Iamgoofball
3c1a0dd0d5 SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded. 2015-06-06 12:47:11 -07:00
Iamgoofball
467cc12ae5 fixes 2015-06-06 00:33:02 -07:00
Iamgoofball
b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
phil235
20a28f7d9e Fixes poppyseed mutating into tomato seeds instead of geranium/lily 2015-05-25 14:48:14 +02:00
Razharas
3222123a9c Merge pull request #9579 from SconesC/sweeten-thy-sad-grave 
Fixes egregious Shakespearean misquote
 2015-05-23 13:37:12 +03:00
SconesC
94814445b4 Fixes minor typo 2015-05-20 18:01:05 -07:00
Jordie0608
2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
Cheridan
ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine 
Resolves #1358, /code/defines/obj.dm reorganization
 2015-05-13 09:23:56 -05:00
Cheridan
f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Jordie
e1f5ed793d Merge pull request #9356 from Firecage/Kudzulogs 
Adds logs for admins to kudzu.
 2015-05-11 23:58:38 +10:00
Firecage
c6b0c8b390 Investigate logs for kudzu planting 2015-05-11 15:18:01 +02:00
Jordie0608
502d21a4da Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine 
Conflicts:
	tgstation.dme
 2015-05-10 14:48:35 +10:00
Jordie0608
7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie
279a2653c6 Merge pull request #9347 from SamuelRowe/master 
Spelling and grammar fixes *FIXED*
 2015-05-09 20:31:54 +10:00
Samuel Rowe
c8ea983267 More 2015-05-07 11:20:14 +12:00
Firecage
e2b2ce91e6 Message_Admin() and Game_Log() added 2015-05-05 20:34:25 +02:00
Cheridan
dfaf90c79e Merge pull request #9264 from phil235/BundleFix6 
a group of fixes.
 2015-05-04 09:41:01 -05:00
phil235
be1708483e - Fixed nettle soup recipe says abstract nettle. 
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
 2015-05-02 01:34:38 +02:00
phil235
4a8e168ff3 - admin revive clears addiction list. 8894 
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
 2015-05-01 19:45:36 +02:00
phil235
c00def95a6 Fixes a runtime with pod plants, this should fix the unharvestable podplant issue. 2015-04-26 17:30:07 +02:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +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
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
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11: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
e2eda9cda8 Fixes growing rice stalk being invisible at later stages. 
Fixes empty trays not receiving the nutrient/reagents/water you give it.
 2015-03-29 15:15:49 +02:00
Razharas
a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix 
Fixes not being able to tablecraft recipes using differen kinds of an item
 2015-03-22 05:32:43 +03: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
Jordie
af6464d8bf Merge pull request #8223 from phil235/MimanaFix 
Mimana fix
 2015-03-19 16:44:29 +11:00
phil235
9b419d26f0 Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza). 
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.

Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
 2015-03-18 20:57:30 +01:00
Iamgoofball
7600697c13 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-03-16 21:13:56 -07:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger 
Conflicts:
	code/modules/events/ninja.dm
 2015-03-15 12:30:27 +01:00
phil235
e3e881e6ee Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
 2015-03-15 12:27:40 +01:00
Iamgoofball
d0f101cd37 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-03-14 21:32:13 -07:00
Cheridan
0b7be73f62 Merge pull request #8286 from phil235/SteelcapFix 
Steel cap, sandstone and welding fixes plus flashing refactor
 2015-03-14 22:56:37 -05: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
Cheridan
9c3ed3da04 Merge pull request #8247 from Incoming5643/Welcome_to_ireland 
Explicitly passes a mobs mutant_color in blood samples
 2015-03-13 15:22:14 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility." 
Changes two "for... show_message()" into "visible_message()".
 2015-03-12 23:15:54 +01:00
phil235
7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods. 
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
 2015-03-10 20:30:46 +01:00
Incoming
c9cc003c65 Explicitly passes a mobs mutant_color in blood samples 2015-03-08 20:55:36 -04:00
Iamgoofball
2cee886f04 whoops and shit 2015-03-08 17:02:38 -07:00
Iamgoofball
573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00