Commit Graph

6438 Commits

Author SHA1 Message Date
xxalpha 6f5ea7f5e7 Adds embedded jetpacks to hardsuits. 2015-03-17 18:42:29 +00:00
Incoming 612ededfd0 Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs.
Fixes an unreported bug where statues could bleed out
2015-03-17 14:26:05 -04:00
Iamgoofball 7600697c13 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-03-16 21:13:56 -07:00
xxalpha 4b596b4b72 Small optimization. 2015-03-16 18:16:12 +00:00
xxalpha 9af4972c40 Movement slowdowns only ignored with a jetpack. 2015-03-16 17:49:05 +00:00
xxalpha 5c813bfd72 No additional movement delay when using a jetpack in zero gravity.
Remove unnecessary checks.
2015-03-16 04:08:12 +00:00
Incoming 1d9d781b59 Adds a little consent system for sentience potions
Fixes an unreported runtime
2015-03-15 20:54:36 -04:00
phil235 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
phil235 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
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
Iamgoofball 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
Cheridan 8e2962c4ab Merge pull request #8255 from GunHog/SiliconVerbFix
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -05:00
Cheridan 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
Iamgoofball 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
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +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
Incoming 05718664cf Docile slime AI won't try to break your pull when you pull them 2015-03-14 13:43:33 -04:00
phil235 1e720ae033 More work on living/life.dm(), simple_animal/life() and robot/life(). 2015-03-14 16:30:59 +01:00
Cheridan f70084ecab Merge pull request #8227 from phil235/HulkCritFix
Hulk crit fixes
2015-03-13 22:56:51 -05:00
Cheridan 62f4cf0d51 what am i doing with my life 2015-03-13 22:47:18 -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
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
MrPerson 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
Mandurrrh 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
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 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
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 60e152c54e slight adjustments.. 2015-03-10 20:43:21 +01:00
phil235 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
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
Cheridan 72f465c864 Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
Remie Richards f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
xxalpha 0f01378e7a Reworked suggested code, added brain implants, misc additions.
Fix missing ')'.

DELETE THIS
2015-03-09 20:39:09 +00:00
phil235 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
Remie Richards d525fd6a87 Merge pull request #7872 from AnturK/hiss
Makes NPC queens/drones plant weeds/eggs
2015-03-09 14:27:55 +00:00
GunHog 97962ba59b Fixes "Sensor Augmentation" showing in silicon verbs
- Fixes #8167
2015-03-09 08:47:38 -05:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Cheridan 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
Cheridan fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
Cheridan 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
Incoming c9cc003c65 Explicitly passes a mobs mutant_color in blood samples 2015-03-08 20:55:36 -04:00
Iamgoofball 2cee886f04 whoops and shit 2015-03-08 17:02:38 -07:00
Iamgoofball 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
Iamgoofball 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
xxalpha fc81daee07 Added Thermals and emp_act(). Tweaked some related code. 2015-03-08 20:19:02 +00:00
xxalpha b1e340b19b Added X-ray implant, implant icon, touched up surgery. 2015-03-08 17:25:05 +00:00
phil235 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