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
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07: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
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05: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
8e2962c4ab
Merge pull request #8255 from GunHog/SiliconVerbFix
...
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -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
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
f70084ecab
Merge pull request #8227 from phil235/HulkCritFix
...
Hulk crit fixes
2015-03-13 22:56:51 -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
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
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
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
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
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
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
72f465c864
Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
...
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
f6e4c1518d
A restructure/removal/cleanup of Ninja Code
2015-03-09 20:43:56 +00:00
71d560bd3a
Fixes a runtime with buckling screen alert
...
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
d525fd6a87
Merge pull request #7872 from AnturK/hiss
...
Makes NPC queens/drones plant weeds/eggs
2015-03-09 14:27:55 +00:00
97962ba59b
Fixes "Sensor Augmentation" showing in silicon verbs
...
- Fixes #8167
2015-03-09 08:47:38 -05:00
4071f25270
Simplifies laser reflection code, no more reflect_chance var at the obj/item level.
2015-03-09 12:28:35 +01:00
b2d6abebb3
Merge pull request #8100 from Incoming5643/newbieguard
...
Adds a free pass to assistant for player accounts younger than two weeks
2015-03-09 02:29:09 -05:00
fbab136950
Merge pull request #8016 from RemieRichards/EmbeddingBalance
...
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05: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
c9cc003c65
Explicitly passes a mobs mutant_color in blood samples
2015-03-08 20:55:36 -04: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
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
93c982ea5c
Fixes hulks not losing their mutation when low on health.
...
Fixes carbon mobs resistant to paralysis not going unconscious when in crit.
2015-03-08 16:38:44 +01:00
643de0c922
Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue.
2015-03-07 18:46:02 +00:00
04dcfaddcf
Merge pull request #8135 from Miauw62/adminjumpfixes
...
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
f84f6aafcd
Fixes adminjump being dumb.
2015-03-07 19:00:48 +01:00
febd47c6d6
byond inline spell checker fucking when
2015-03-06 15:20:56 -05:00
d5ec11b91c
Merge pull request #8080 from Incoming5643/Appearance_fix
...
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
07676b352d
Merge pull request #8128 from Ikarrus/gangfixup
...
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
546c5eedc4
if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human
2015-03-05 14:23:19 -05:00
82bc75c263
Moves chat toggles into their own variable.
2015-03-05 18:38:07 +01:00
f68fd02d26
Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
...
On screen alert system
2015-03-04 19:39:04 -06:00
15bc4760a7
fixes
2015-03-03 21:46:38 -08:00
b98c5584df
NEWCRIT + other changes
2015-03-03 21:35:30 -08:00
6de8b0bd0c
Enforces :3 on docile slimes, gives newly sentient creatures some direction on not wasting their creators, and fixes spelling errors
2015-03-03 17:12:46 -05:00
d36488e5a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
Iamgoofball
phil235
Cheridan
hornygranny
MrPerson
phil235
Remie Richards
GunHog
Incoming
Miauw
Incoming5643