Commit Graph

280 Commits

Author SHA1 Message Date
Cheridan
c1afd57b9b Merge pull request #1809 from Giacom/telesci_easymode
Telescience Change
2013-11-20 10:13:24 -08:00
Giacomand
602a2772d2 Another grammar thing. 2013-11-17 19:35:04 +00:00
Giacomand
99fa92e9c6 * Made wet floors use a static overlay.
* Standardized the wet floor code, it is now called MakeSlippery(var/wet_setting)
 * Added the wet floor static overlay, which is just a single frame of the usual animation.
 * Made the floor randomly dry (by a few seconds apart), for visual effect.
2013-11-15 17:28:04 +00:00
Cheridan
16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak
Telescience Update
2013-11-14 15:30:01 -08:00
Giacomand
b8c031026c * Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.
* The telescience computer starts with 3 artificial crystals.
 * The crystals can be crushed to blink or you can throw it at someone to make them blink a short distance.
 * You cannot teleport the AI or any anchored mob (unless they are buckled to an office chair).
 * You can make the bluespace crystals from slimes or from research.
2013-11-12 14:24:56 +00:00
Cheridan
94e4574c9a Merge pull request #1744 from fleure/lemonlime
Adds sprite for lemon-lime in a glass
2013-11-10 20:34:17 -08:00
Fleure
bd9b00ebb8 Adds sprite for lemon-lime in a glass 2013-11-10 00:26:18 +00:00
Giacom
c25f14e74d Merge pull request #1659 from sawu-tg/master
Food additions
2013-11-09 13:24:29 -08:00
Cheridan
637e7f72c9 Nuke Op Population Scaling and Content Update
to be edited
2013-11-03 16:41:57 -06:00
Giacom
d77963bc43 Merge pull request #1683 from Miauw62/borgshaker
Improved cyborg shakers.
2013-10-31 05:56:05 -07:00
Miauw
e543604d2b Improved the new cyborg shaker. 2013-10-30 21:55:05 +01:00
Cheridan
f9907e5fce Merge pull request #1674 from Giacom/dis_tiny_fix
Validates the spray bottle is still on the user when emptying.
2013-10-29 23:14:05 -07:00
Miauw
04faefd5d9 Improved cyborg shakers. They now synthesize all base drink ingredients. 2013-10-29 22:02:00 +01:00
Giacomand
9b2437aa71 * Validates the spray bottle is still on the user. 2013-10-28 17:29:09 +00:00
MIC132
26ded6a622 Re-fixed using Giacom proposal. 2013-10-26 21:27:04 +02:00
Benjamin Read
9caceff92a adds more "complete" food, using the unfinished feeling food (such as fried egg, sausage etc)
Icons credit to chocobro/420weedscope
2013-10-27 05:12:33 +11:00
Aranclanos
dd281bb6b2 Merge pull request #1561 from RobRichards1997/11/10/2013-Limbs-are-Objects
Changes Limbs into Objects [Merge/Give Feedback]
2013-10-22 00:41:09 -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
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
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
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
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
Robson Richards
1c70008d0c Changes Limbs into Obj's
Reworked all the paths for it
Reworked all the procs for it
2013-10-11 19:11:55 +01: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
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
1a782cb3e8 Recent Bluespace Technology research has resulted in Bluespace Beakers! 2013-10-09 19:22:08 -07:00
AstralSerpent
535050fd3b Returned /proc/mix_color_from_reagents(var/list/reagent_list) to normal, so crayons mix like normal reagents. 2013-10-09 05:45:00 +11:00
Cheridan
19470fc542 Adds copypasta!
Adds copypasta!
2013-10-07 17:27:12 -05:00
Giacomand
796f3ca9f1 Merge pull request #1517 from Mloc/tg-byond500
[MAP] Refactors the code to work with BYOND 500.  Big commit.
2013-10-07 07:05:46 -07:00
Aranclanos
d062009a6e Merge pull request #1507 from Giacomand/napalm
Napalm works again, which fixes incendiary grenades.
2013-10-06 17:01:46 -07:00
Giacomand
ef41ccf5da * Removed SPAWN_COLD 2013-10-07 00:55:52 +01:00
Mloc-Argent
79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Giacomand
6ef330ec3e * Made frostoil use SPAWN_COLD when used on a turf. 2013-10-06 00:41:40 +01:00
Giacomand
3b667227e5 * Made atmos_spawn_air() use flags.
* Replaced "fire" with SPAWN_HEAT. You will have to use it in conjunction with SPAWN_TOXINS to spawn fire.
 * Added flags for HEAT, COLD, TOXINS, OXYGEN, CO2, NITROGEN, N2O, FUEL and AIR.
2013-10-06 00:29:45 +01:00
Giacomand
f6e62cd830 * Napalm works again, which fixes incendiary grenades.
* Stopped the fuel and n20 option, in spawn_air, from runtiming.
 * Added toxins as a spawn_air option.
 * Removed all use of the fuel option and replaced it with toxins, since fuel does not work with LINDA anymore.
2013-10-05 23:06:24 +01:00
AstralSerpent
5ca72b7a5d Made reagent descriptions nicer (Also I forgot to finish it before! Woops.) 2013-10-06 08:35:34 +11:00
AstralSerpent
6462332591 Added the ..() as lord Giacom requested. Added changes to grinder that giacom did. May as well let them piggyback on this commit and hope it somehow forces my gloriously bads crayon powder to be pulled. 2013-10-06 08:16:17 +11:00
AstralSerpent
73d4b247a2 Changes some stuff Giacom provided input on. Thanks Aranclanos and Kaze Espada for the help. 2013-10-06 07:21:19 +11:00
AstralSerpent
113d6c0193 Crayons can now be grinded down for coloured crayon powder, which can be used and combined to override reagent colours. 2013-10-05 17:23:17 +10:00
Rolan7
55f8959e56 The trans_to proc for /datum/reagents/ now detects and accepts /datum/reagents/ as targets instead of just reagent_containers. Updated the hydroponics attack_by to use that new feature. Improved the microwave-cleaning to use amount_per_transfer_from_this. It does ignore other reagents, only using up space cleaner, because it really doesn't need to be complicated. 2013-10-04 00:27:30 -04:00
Rolan7
4a88f8c6d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue1404-PlantBGone 2013-10-03 19:04:25 -04:00
Aranclanos
a7a9a27ffb Merge pull request #1460 from Giacomand/nobreathe
Blob Spore Clouds
2013-09-28 17:19:44 -07:00
Aranclanos
6d87e5a11d Merge pull request #1389 from KazeEspada/computers
Cleans up computer code severely.
2013-09-28 14:48:42 -07:00
Cael Aislinn
4ea0fe35b0 Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire
Mobs on fire: The return: The reckoning
2013-09-28 10:00:24 -07:00
Giacomand
f5e3037e6d Merge branch 'master' of https://github.com/Giacomand/-tg-station into nobreathe
Conflicts:
	code/game/objects/effects/effect_system.dm - Resolved.
2013-09-28 01:07:20 +01:00