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
94bb6f9fd6
lmao
2015-03-14 21:04:37 -04:00
8ee898d67a
ayy
2015-03-14 21:04:11 -04:00
0cdffeecfb
Merge pull request #8296 from phil235/TablecraftFix
...
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
7c305305b7
Fix reagent garbage collection hopefully
...
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
2015-03-14 16:52:49 -07:00
0232afd05d
Fix typo in catalyst.
...
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
2015-03-15 00:23:47 +01:00
913d64b9a7
Fix dough and cakebatter recipes.
2015-03-14 23:59:56 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
1027c7619c
Merge pull request #8206 from RemieRichards/AILessProcessing
...
Hostile Mob AI Optimisation
2015-03-14 16:21:22 -05:00
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
565ac0b4de
quickfix
2015-03-14 14:38:01 -04:00
17a9556798
Adds 3 new bear-related foods. Now with 100% less 4k+ line changes.
2015-03-14 14:22:29 -04:00
05718664cf
Docile slime AI won't try to break your pull when you pull them
2015-03-14 13:43:33 -04:00
1e720ae033
More work on living/life.dm(), simple_animal/life() and robot/life().
2015-03-14 16:30:59 +01:00
f70084ecab
Merge pull request #8227 from phil235/HulkCritFix
...
Hulk crit fixes
2015-03-13 22:56:51 -05:00
62f4cf0d51
what am i doing with my life
2015-03-13 22:47:18 -05:00
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
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
6e26db3783
Merge pull request #8288 from Ahammer18/Sensors
...
Toggle/Adjust suit sensors
2015-03-13 14:45:08 -05:00
875313be9e
Merge pull request #8279 from MrPerson/pull_rapidemente_ariba_ariba_vamanos
...
Pulling icon en-speedening
2015-03-13 12:22:17 -07:00
e7ba8df654
Moved all pull icon updating to update_icon(), to reduce copy+paste.
...
Made the pull icon update_icon() as part of creation as requested by oranges.
2015-03-13 12:10:13 -07:00
12f5f6ae20
Merge pull request #8290 from Ahammer18/droneassfinal
...
Drone asses!
2015-03-13 13:57:43 -05:00
579736870c
informative commit name
...
proper, informative extended description
2015-03-13 19:44:09 +01:00
24b2d03e0f
Merge pull request #8283 from Miauw62/taserdelayymao
...
Reduces the taser firing delay.
2015-03-13 12:58:24 -05:00
7e011680ec
Merge pull request #8237 from GunHog/CherryFlavoredPins
...
Loyalty Implant Firing Pins
2015-03-13 12:57:28 -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
1f400f6860
Increases requirements
...
Reqs to make it are now Combat 6, Mats 6, Power 3.
2015-03-13 12:15:49 -05:00
6225ed8fb4
Chat toggles are saved to the savefile properly again. Fixes #8318
2015-03-13 16:39:28 +01:00
27cfbdcb2a
Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car
...
Fixes cavity implant surgery not respecting NODROP
2015-03-13 12:23:44 +01:00
8248baee67
Merge pull request #8230 from norill/master
...
fixed improper req_tech "power" -> "powerstorage"
2015-03-13 12:16:06 +01: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
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
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05: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
921ed1330e
Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory.
...
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
2015-03-12 14:34:23 +01:00
a15adec48d
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-12 13:32:30 +01:00
424d6d305e
Re-adds flip verb
2015-03-11 17:32:35 -04:00
82d9761f1f
Fixes notasandwich and flamethrower tablecraft recipes
...
Add a recipe detection to tablecrafting, if you have some of the things required for the recipe (50% of the amount of different things needed, i.e if less than 3 different things in the recipe then you need 1, otherwise 2+), it will now appear in grey in the tablecrafting window. The tablecrafting window will also lists the requirements for each recipes it shows.
2015-03-11 19:36:51 +01:00
8a780e89bf
Overloading improvised shells
...
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
2015-03-11 11:41:26 +00:00
aa2cf3c469
Added drone asses
2015-03-10 20:35:11 -05:00
3bf0c7015a
Replace some object verbs with alt-clicking
2015-03-10 21:28:13 -04:00
821a967986
Added Research designs for all implants. Added brain implant emp_act().
2015-03-10 23:39:08 +00:00
5d5c21266c
Merge pull request #8262 from MMMiracles/usaneverdie
...
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
d2b650ad44
Changed "Toggle Suit Sensors" to "Adjust Suit Sensors" because we now have a menu that pops up when you want to change your suit sensors.
2015-03-10 18:20:14 -05:00
1eba7b694b
Merge pull request #8134 from Miauw62/ghostradios
...
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
Cheridan
Iamgoofball
MMMiracles
MrPerson
phil235
Incoming
Cheridan
hornygranny
Swag McYolosteinen
GunHog
phil235
Mandurrrh
Xhuis
Thunder12345
Ahammer18
xxalpha