cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,153 Commits 61 Branches 14 Tags
b16c18cb8a4bae802a55e080a4268c7f891778cc
Commit Graph

3449 Commits

Author SHA1 Message Date
Cheridan
b16c18cb8a Merge pull request #1596 from AlexanderUlanH/fingerprint 
DNA/Fingerprint Bugfixes
 2013-10-18 23:54:50 -07:00
Cheridan
39dde554cd Merge pull request #1592 from Giacom/smartfridges 
Chemistry and Virology Smart Fridges [MAP]
 2013-10-17 14:08:02 -07:00
Cheridan
9e58e3cd3c Merge pull request #1579 from Giacom/allow_ai 
The Allow AI config option will now correctly stop players from choosing AI as a job.
 2013-10-17 12:20:21 -07:00
Cheridan
d7b7f19ed6 Merge pull request #1568 from Mloc/tg-fix3 
Miscellaneous fixes and pipe unwrenching cleanup.
 2013-10-17 12:08:52 -07:00
Cheridan
5c60ca8106 Merge pull request #1573 from Neerti/wearable_bedsheets_as_capes 
Wear bedsheets... on your back!
 2013-10-17 11:40:26 -07:00
Giacom
1a23bc2326 Merge pull request #1555 from Ergovisavi/fire_explosion 
Fiery Explosions! - And some wizard tweaks
 2013-10-17 00:19:25 -07:00
Ergovisavi
cd904826f1 Removed flame_range from meteor explosions, reduced flame_range on syndie minibomb, added flame_range to all welderbomb explosions, made args prettier 2013-10-16 22:10:26 -07:00
MrPerson
6b028c93ef Merge pull request #1583 from Giacom/ai_alt 
The AI can now use alt click to get a list of objects and the turf for easy access. [CHANGELOG]
 2013-10-16 15:34:46 -07:00
AlexanderUlanH
cb2c8543f2 Fixed a Fingerprint Runtime 
Typos, whoo.
 2013-10-16 17:02:49 -04:00
Giacom
38725a5098 Capitalized the names of the beaker research datums. 2013-10-16 20:01:06 +01:00
Giacom
0b9b6557fa Merge pull request #1546 from Iamgoofball/shrinkray 
Beaker Update
 2013-10-16 11:57:57 -07:00
Giacomand
e6d23b2ad4 * Super thank you to SuperSayu for the smartfridge modifications, which makes smart fridges easier to customize. 
* Added smart fridges for Virology and Chemistry.
 * The chemistry smart fridge was placed by the south desk, allowing medical doctors to grab medicine and for chemists to organize their medicine.
 * The virology smart fridge has been placed on a table and now stores the starting viruses that the virologist gets. As a bonus they also get a single bottle of mutagen and synaptizine. Do not worry, these bottles will need refills very quickly and you need to use at least 5 units for each reagent, to use them in creating viruses.
 2013-10-16 19:32:05 +01:00
Giacomand
fe0826c3d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ai_alt 
Resolved Conflicts:
	html/changelog.html
 2013-10-16 17:16:36 +01:00
Giacomand
1bf07a3065 * The AI can now use alt click to get a list of objects and the turf for easy access. 
* The AI can interact with all the items in the list.
* The AI can use this for several things:
 * Since the list will not dissappear for the AI, until there's no camera coverage, they can use it to bookmark a single tile to interact while not having to look at it.
 * They can also use this to quickly jump to the listed turf.
 * They can interact with objects under other objects.
* Made the CTRL Click on the APC directly use the toggle_breaker() proc.
 2013-10-14 17:23:53 +01:00
Giacomand
aee50633e7 * The Allow AI config option will now correctly stop players from choosing AI as a job. 
* The job select screen will now fill in the rest of the last column, so it doesn't look uneven.
 2013-10-13 22:42:25 +01:00
Giacomand
a24745b6d2 * Added a new malf power: Machine Override will delete the machine and swap it with a mimic, with generated attack stats and the same icon as the machine it has replaced. Effectively making it look like the machine is attacking people. 
* The power will cost the same as overload.
 * Reduced the price and uses of uncommon malf powers so that they can be used when the AI only has 5-10 points left.
 2013-10-13 16:23:37 +01:00
Aranclanos
7408c84e3e Merge pull request #1558 from Cheridan/EVENTS 
Minor Event Adjustments
 2013-10-12 19:03:07 -07:00
Neerti
6ffb6f1e20 Bedsheets can be worn, details in PR. Fixed merge conflicts hopefully. 2013-10-12 20:46:54 -04:00
Iamgoofball
2ce6532c5b Actually made it 300 this time, I don't know how to into save button. 2013-10-12 14:35:56 -07:00
Pete Goodfellow
de8ac52a10 Merge pull request #1552 from Giacom/proj_runtime 
Fixes a projectile runtime.
 2013-10-12 11:28:10 -07:00
Mloc-Argent
bc087e7bdd Fixes #1566 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-12 17:23:33 +01:00
Giacom
2a4d76197c Merge pull request #1550 from KionX/master 
Fix warming of the Field Generator
 2013-10-12 07:15:24 -07:00
Giacom
8480c0cf03 Merge pull request #1556 from Miauw62/ifuckedupmmis 
Rudimentary transform to borgs now works properly.
 2013-10-12 07:15:06 -07:00
Ergovisavi
470341ecfd Made explosion arguements more readable for the ones with flame_range added to them 
flame_range explosions no longer call fire_act() on mobs in the range, but instead spawn a hotspot on them.
 2013-10-11 20:07:53 -07:00
Iamgoofball
f680c9816a Made some adjustments. 2013-10-11 14:06:52 -07:00
Cheridan
a414a51847 Supresses adminlogging for brand intelligence explosions. 
Carp Migration is now announced immediately, with the carp coming shortly afterwards.
 2013-10-11 12:36:05 -05:00
Miauw
0b836b05e7 Rudimentary transform to borgs now works properly. 2013-10-11 18:30:08 +02:00
Giacom
9b7a1bec2a Merge pull request #1535 from Incoming5643/StaffAnimation 
Repairs and Expands the Staff of Change
 2013-10-11 07:28:58 -07:00
Giacom
5a66229d70 Merge pull request #1529 from Miauw62/ifuckedupmmis 
More MMI fixes [Nope still not ready]
 2013-10-11 07:25:49 -07:00
Iamgoofball
0e4ae88f5a Made it harder to get the bluespace Beaker, and reduced it's reagent holding capabilities to 300 units. 2013-10-10 19:41:57 -07:00
Ergovisavi
7fd1465e17 Adds a new arg to explosion(), flame_range, for fiery explosions! Any mob in that range will be set on fire! Also creates some hotspots (mostly for ambience, won't generate them on existing space tiles) and changes the spawn explosion in the VV tab to let admins make fiery explosions. 
Adds a cap for flame_range in global.dm
Added a flame_range for syndibombs, syndieminibombs, Wizard's fireball, fuel tank explosions, and meteors.

Adds firesuit level temperature protection to the wizard hardsuit for safety from your own fireballs setting you ablaze
Adds ExtinguishMob() for Ethereal Jaunt to make wizards a little less vulnerable to fire
 2013-10-10 18:46:47 -07:00
Cheridan
fc82725d87 Merge pull request #1514 from Giacomand/rampant_tweak 
Tweaked the brand intelligence event to use the mimic copy class.
 2013-10-10 16:28:19 -07:00
Cheridan
692f5e3d02 Merge pull request #1505 from Giacomand/disposalsfixes 
Fixed disposal units not starting with full pressure.
 2013-10-10 16:12:23 -07:00
Giacomand
717064bfc6 * Fixes a projectile runtime. 2013-10-10 23:03:14 +01:00
Giacomand
de20a961b1 Merge pull request #1536 from Jordie0608/X-ray 
Xray guns unique and buildable
 2013-10-10 14:31:59 -07:00
Giacomand
aa54ceeb14 Merge pull request #1540 from Incoming5643/spooky 
2SPOOKY
 2013-10-10 14:13:44 -07:00
KionX
8264a317ea Fix warming 2013-10-10 12:51:54 -07:00
Giacomand
3b958ebb54 Merge pull request #1500 from AstralSerpent/master 
Crayons can now be grinded down for coloured crayon powder, which can be...
 2013-10-10 11:59:54 -07:00
Iamgoofball
dd4eb0fc76 Changed Split Beakers to Cryostasis beakers, no gameplay changes however. Increased the research reqs on Bluespace beaker to Bluespace 2 Materials 4. 2013-10-10 08:59:01 -07:00
Iamgoofball
560476fd52 Adds Split Beakers, which are no reaction beakers, for storing chemicals you DON'T want to blow up in your face. Holds 50 units. 2013-10-09 21:07:07 -07:00
Iamgoofball
b703c4adad Ups the price for building to 3000 of each because I don't know how to into honking. 2013-10-09 19:29:07 -07:00
Iamgoofball
1a782cb3e8 Recent Bluespace Technology research has resulted in Bluespace Beakers! 2013-10-09 19:22:08 -07:00
Aranclanos
c62f5cd8d7 Merge pull request #1527 from Mloc/tg-fix2 
Small fixes, a new atom flag, a fix for alt-gr, and some cyborg changes.
 2013-10-09 13:15:52 -07:00
Aranclanos
ee35e83494 Small changes for cael's shuttle loan event 2013-10-09 16:44:52 -03:00
Aranclanos
b6e1fc6d95 Merge branch 'terbs_weekly_fun' of https://github.com/caelaislinn/-tg-station into terbs_weekly_fun 
Conflicts:
	code/controllers/supply_shuttle.dm
 2013-10-09 16:03:39 -03:00
Miauw
6bf4e381e7 Fixed cyborgs starting without a brain in their MMI. 2013-10-09 19:23:02 +02:00
Giacomand
4ff9db9281 Merge pull request #1526 from AnturK/smallfix 
Fix for #1317
 2013-10-09 09:36:25 -07:00
Giacomand
723bd6b386 Merge pull request #1532 from Cheridan/omnom 
Adds copypasta!
 2013-10-09 00:19:36 -07:00
Jordie
416cbee62c Xrays shoot everything but walls 2013-10-09 18:05:33 +11:00
Incoming
feedac9505 Add a special always run event for halloween where the entire crew bursts into skeletons after a short while. 
This has no real effect on anything besides the fact that skeletons can use the rarely touched xylophone var.
Adds a pair of usr checks for corgis so events can place things on their head without incuring a runtime (the chrismas event also does this)
 2013-10-08 22:38:03 -04:00