Cheridan
0cdffeecfb
Merge pull request #8296 from phil235/TablecraftFix
...
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
phil235
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
Cheridan
1027c7619c
Merge pull request #8206 from RemieRichards/AILessProcessing
...
Hostile Mob AI Optimisation
2015-03-14 16:21:22 -05:00
Cheridan
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan
f552aa0ce1
Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
...
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
Cheridan
f70084ecab
Merge pull request #8227 from phil235/HulkCritFix
...
Hulk crit fixes
2015-03-13 22:56:51 -05:00
Cheridan
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
Cheridan
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05: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
Cheridan
6e26db3783
Merge pull request #8288 from Ahammer18/Sensors
...
Toggle/Adjust suit sensors
2015-03-13 14:45:08 -05:00
Cheridan
2085f2d0d9
Merge pull request #8302 from phil235/DoorCrushMech
...
Door can now crush mech, dealing damage, just like with mobs.
2015-03-13 14:30:44 -05:00
Cheridan
77505c36af
Merge pull request #8300 from xxalpha/everyday
...
Fixes not being able to move from a single lattice.
2015-03-13 14:27:09 -05:00
hornygranny
875313be9e
Merge pull request #8279 from MrPerson/pull_rapidemente_ariba_ariba_vamanos
...
Pulling icon en-speedening
2015-03-13 12:22:17 -07:00
MrPerson
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
Cheridan
12f5f6ae20
Merge pull request #8290 from Ahammer18/droneassfinal
...
Drone asses!
2015-03-13 13:57:43 -05:00
Cheridan
24b2d03e0f
Merge pull request #8283 from Miauw62/taserdelayymao
...
Reduces the taser firing delay.
2015-03-13 12:58:24 -05:00
Cheridan
7e011680ec
Merge pull request #8237 from GunHog/CherryFlavoredPins
...
Loyalty Implant Firing Pins
2015-03-13 12:57:28 -05:00
Cheridan
3b89c07cd3
Merge pull request #8259 from phil235/BibleBookBagBug
...
Fixes book bags not being able to hold bibles and looking like backpacks
2015-03-13 12:51:10 -05:00
GunHog
1f400f6860
Increases requirements
...
Reqs to make it are now Combat 6, Mats 6, Power 3.
2015-03-13 12:15:49 -05:00
phil235
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
phil235
8248baee67
Merge pull request #8230 from norill/master
...
fixed improper req_tech "power" -> "powerstorage"
2015-03-13 12:16:06 +01:00
phil235
b3d9c9ca43
Merge pull request #8232 from Iamgoofball/patch-43
...
Cyborgs no longer have flesh to knit.
2015-03-13 12:12:39 +01:00
Cheridan
61d656a173
Merge pull request #8253 from Jordie0608/mergeconflictsihavenoideawhatyouretalkingabout
...
Unhardcodes brig timers
2015-03-12 21:30:26 -05:00
Cheridan
e8bd0de8c2
Merge pull request #8270 from Incoming5643/you_cannot_reblob
...
Keeps badmin blobs from trying to win with blob round blobs objectives.
2015-03-12 21:29:11 -05:00
Cheridan
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
phil235
51e3bef054
Merge pull request #8294 from norill/mutfix
...
acquiring negative mutations shows in red in chat
2015-03-12 20:11:28 +01:00
phil235
16a0d7bf80
Fix for flamethrower deconstruction.
2015-03-12 19:58:37 +01:00
phil235
4768a84376
Door can now crush mech, dealing damage, just like with mobs.
2015-03-11 23:09:02 +01:00
xxalpha
9a116aea62
Fixes not being able to move from a single lattice.
2015-03-11 21:04:54 +00:00
hornygranny
6f0319e7b7
Merge pull request #8287 from phil235/CuffResistFix
...
Fixes resisting out of cuffs failing.
2015-03-11 12:17:54 -07:00
phil235
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
norill
5ef5c5444d
acquiring negative mutations shows in red in chat
2015-03-11 17:11:35 +01:00
norill
cfeac324df
Revert "acquiring negative mutations shows in red in chat"
...
This reverts commit 5e003e828d
2015-03-11 16:54:00 +01:00
norill
5e003e828d
acquiring negative mutations shows in red in chat
2015-03-11 16:33:57 +01:00
Ahammer18
aa2cf3c469
Added drone asses
2015-03-10 20:35:11 -05:00
phil235
5d5c21266c
Merge pull request #8262 from MMMiracles/usaneverdie
...
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
Ahammer18
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
phil235
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
phil235
cb96e65f1b
Merge pull request #8254 from Steelpoint/HoSGunSpelling
...
[BALANCE]Buffs the Head of Security's Firearm.
2015-03-10 22:09:46 +01:00
Miauw
09cf2e474f
Reduces the taser firing delay.
2015-03-10 19:36:05 +01:00
MrPerson
692cfa4f1f
Pulling icon en-speedening
...
Made the little pulling icon on the bottom right corner of your screen update right away when you start or stop pulling instead of updating as part of life(). Or Move().
2015-03-10 08:54:12 -07:00
MMMiracles
552232496b
typo fix
2015-03-10 09:18:12 -04:00
phil235
b5c63a9b2f
Fixes resisting out of cuffs failing.
2015-03-10 12:24:15 +01:00
Steelpoint
a5ba5972b4
AdditionalSpelling
2015-03-10 17:26:05 +08:00
Incoming
c21c3046f3
Hamfistedly fixes #8266
2015-03-10 02:51:58 -04:00
Incoming
866cadb1ea
The roundtype will be converted. If you feel that the round should not continue, end the round now.
...
The roundtype will be converted. If you feel that the round should not continue, end the round now.
The roundtype will be converted. If you feel that the round should not continue, end the round now.
2015-03-10 02:33:20 -04:00
Cheridan
72f465c864
Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
...
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
MMMiracles
04a78be390
adds the freedom eagle, the only true friend a patriot can find within the region of socialist space.
2015-03-09 22:09:21 -04:00
Remie Richards
370a7100c7
Moves ninja shoes into the ninja folder
2015-03-09 23:02:26 +00:00
MMMiracles
1b1ee50b00
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
