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
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
829045231b
fixes shit
2015-03-20 23:41:55 -07:00
c4f7ee6196
Merge pull request #8233 from Iamgoofball/patch-44
...
Meth no longer breaks the space time continuum.
2015-03-21 17:23:55 +11:00
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07:00
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
65b0bf7a14
new colors for smoke, flash, and sonic powder
2015-03-20 21:12:20 -07:00
26c407ec91
removes outdated comments
2015-03-20 20:17:19 -07:00
f0f5eb7543
Reverts the turf checks on clf3 due to #8437 fixing the underlying issue
2015-03-19 20:09:04 -07:00
af6464d8bf
Merge pull request #8223 from phil235/MimanaFix
...
Mimana fix
2015-03-19 16:44:29 +11:00
0b551856b0
Makes flash and sonic powder effects scale their range based on the amount set off.
2015-03-18 21:07:38 -07:00
b7adce753a
Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks.
2015-03-18 20:33:03 -07:00
3607b645af
Reverts the goonchem pathing. It is back to /datum/reagent now.
2015-03-18 19:22:11 -07:00
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
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
8701459651
Fixes and changelog update
2015-03-16 20:46:51 -07:00
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
aaac85707f
Merge pull request #8204 from Iamgoofball/patch-41
...
Nerfs acid blob again
2015-03-15 15:56:23 -05:00
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
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
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
5fd5d0b8c1
Color cleaning effects removed from space cleaner and water pending future changes to colors in a future PR.
2015-03-14 22:24:58 -07:00
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
33ffd33180
fixes and tweaks
2015-03-14 21:13:23 -07:00
1732ab6b02
Merge pull request #8311 from phil235/SprayFix
...
Fixes chemsprayer duplicating reagents. Simplifying its code.
2015-03-14 22:59:49 -05:00
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
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
fa75aed6d3
Reverts 3tick and 1tick
2015-03-14 19:51:54 -07:00
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
9038fb15af
Code cleanup
...
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
b3d9c9ca43
Merge pull request #8232 from Iamgoofball/patch-43
...
Cyborgs no longer have flesh to knit.
2015-03-13 12:12:39 +01:00
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
c04468576f
Fixes chemsprayer duplicating reagents. Simplifying its code.
...
Chem puff spray can no longer give more chems to mobs than it contains.
Mobs being in front of the chem puff shorten its total range.
Fixes using the spray at short range not showing the whole chemical puff animation.
For a given max range of a spray, aiming closer will now transfer more chemicals to each mobs/objs/turfs than aiming the furthest.
2015-03-12 19:54:36 +01:00
60e152c54e
slight adjustments..
2015-03-10 20:43:21 +01:00
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
f6e4c1518d
A restructure/removal/cleanup of Ninja Code
2015-03-09 20:43:56 +00:00
82b1b1adcd
Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
...
Conflicts:
icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
bc091234ee
Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad)
...
You can only break eggs on glass containers (beaker,bucket,bowl,etc)
2015-03-09 19:43:39 +01:00
7b6532ca79
Merge pull request #7984 from Incoming5643/farewell_to_shitty_slimes
...
Reworks the pink/light pink slime line to not be nearly worthless to breed
2015-03-09 01:03:21 -05:00
855cf7c6b5
Fixes morphine to actually knock you out.
2015-03-08 20:50:09 -07:00
bb066ae1ce
Merge pull request #8210 from phil235/CoffeeOverdose
...
Changing Coffee jittering to be an overdose effect.
2015-03-08 22:18:32 -05:00
e5a3694c0f
Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff.
2015-03-08 19:43:17 -07:00
4338a3f4ca
forgot to make krok work right
2015-03-08 17:15:06 -07:00
2cee886f04
whoops and shit
2015-03-08 17:02:38 -07:00
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
b7aee533b5
Readd the last_tick var and buff mutetoxin effect to solve the issue with 'silent' in a simpler way.
2015-03-08 22:44:47 +01:00
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
1a092e0ede
Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
...
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
f602408aef
Update Chemistry-Goon-Medicine.dm
2015-03-08 13:12:29 -07:00
61e1abafc6
Meth no longer breaks the space time continuum.
2015-03-08 10:45:25 -07:00
Razharas