Commit Graph

5136 Commits

Author SHA1 Message Date
Razharas 831f279865 Merge pull request #12415 from bgobandit/cuteshrooms
Walking mushroom fixes/tweaks
2015-10-16 21:48:30 +03:00
Razharas 4dca285198 Merge pull request #12390 from KorPhaeron/AP2
Another slight tweak to armour penetration
2015-10-16 20:09:02 +03:00
Razharas 257af908fb Merge pull request #12284 from KorPhaeron/spookyscary
Night Vision for revanants
2015-10-16 09:08:56 +03:00
Razharas 653dcbc0f4 Merge pull request #12380 from MrPerson/alert_rewrite
Mild rewrite of screen alerts to enable more functionality
2015-10-16 09:04:50 +03:00
Aranclanos d1cac57f96 Merge pull request #12405 from feemjmeem/bugfixes-oct14
Some itty bitty bugfixes (Oct 14)
2015-10-15 23:47:31 -03:00
bgobandit cdd1cac39a walking mushroom stuff 2015-10-15 14:43:43 -04:00
Razharas 1bbc8944b3 Merge pull request #12387 from Shadowlight213/Revmes
Makes revenant malfunction ability not affect SMES
2015-10-15 16:05:15 +03:00
Razharas cea2a5ad22 Merge pull request #12358 from bgobandit/xenowhisperfix
Fixes xenos being able to whisper to ghosts, for real this time.
2015-10-15 16:04:33 +03:00
Razharas 9f492ea30f Merge pull request #12352 from KorPhaeron/parasitefix
Guardian/Parasite Fixes
2015-10-15 16:03:36 +03:00
Marc R. Uchniat 4fa1d75f36 Fixes #12188, ' no longer breaks AI hrefs in binary chat 2015-10-14 16:42:29 -07:00
Marc R. Uchniat b97a8b536d Fixes #12095, chance for EMP to call shuttle restored 2015-10-14 16:09:45 -07:00
KorPhaeron 645c7ab9e3 Removes extra srcs 2015-10-14 03:52:24 -05:00
KorPhaeron 064cae7ed6 AP2 2015-10-14 03:44:11 -05:00
Shadowlight213 99d1c92af5 Makes revenant malfunction ability not affect SMES 2015-10-13 21:41:02 -07:00
MrPerson 610483ea1e Mild rewrite of screen alerts to enable more functionality
Specifically I wanted to allow #12043 to correctly implement clicking an "on fire" alert to call resist without affecting other alerts which is currently impssible. Plus this whole mess was stupid and bothering me so here we go.
2015-10-13 17:16:23 -07:00
Remie Richards 61d23d8c11 Merge pull request #12354 from KorPhaeron/AP
Adds armour penetration checks to shields, adds armour penetration to simple animals
2015-10-13 23:08:52 +01:00
Cheridan b847f6c91f Merge pull request #12323 from phil235/BugFixBoogalooE
Bugfixes, again
2015-10-13 17:08:37 -05:00
Remie Richards 16db6f8cc0 Merge pull request #12299 from phil235/SlimeFeedBuckling
Slime feed buckling
2015-10-13 23:08:06 +01:00
Remie Richards fac1403423 Merge pull request #12324 from KorPhaeron/firingpins
Syndicate simple mob hotfix
2015-10-13 23:06:32 +01:00
Remie Richards 844f8e84fb Merge pull request #12271 from CosmicScientist/LarvaMe
Adds me to larva
2015-10-13 23:05:26 +01:00
Remie Richards 55287c3eb9 Merge pull request #12314 from AnturK/morphfix
Fixes morph examine infinite loop
2015-10-13 23:04:15 +01:00
bgobandit 4d049bfb41 Fixes xeno whispers, for real this time. 2015-10-12 16:18:34 -04:00
phil235 a311e7a739 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeFeedBuckling
Conflicts:
	code/game/objects/structures/janicart.dm
2015-10-12 22:01:57 +02:00
phil235 3c788fcc59 Fixes Atmos fire helmets spawning in the wardrobe closet instead of the atmos closet.
Fixes Toggle Helmet light verb on security helmet with seclite attached being usable while dead.
Fixes Lizard snout is poking through helmet
Fixes Space helmets not hiding masks and glasses (especially the large gar glasses)
Eva harsuit helmet no longer has a semi transparent part (incompatible with hiding masks and glasses, and causes lizard snout protruding from that helmet)
Made equip_to_slot() and unEquip proc more OOP at the carbon level which removes some duplicate code between monkey and human.
Readding code\modules\mob\living\carbon\brain\login.dm that someone (probably me) unchecked some time ago by mistake.
2015-10-12 21:50:59 +02:00
KorPhaeron f1e12a2783 Buffs AP 2015-10-12 12:38:15 -05:00
KorPhaeron 3a956d5f87 Fixes 2015-10-12 12:14:10 -05:00
CosmicScientist 582a3b0e1c Reverts line 105
Would cause more emotes than intended.
2015-10-12 13:30:27 +01:00
KorPhaeron 4b162975cb Fix 2015-10-11 13:48:55 -05:00
phil235 c19d1c1427 Removed unused code in hologram.dm
Fixes displaycase when you could put a new item in it w/o first removing the first one.
Fixes parrot going through windows when getting on its perch, and some other cases of in_range() instead of Ajacent().
Fixes not being able to change transfer amount of reagent containers while buckled.
Remove unused sprites in stationobjs.dmi
2015-10-11 20:18:13 +02:00
AnturK 6553207735 Fixes morph infinite loop 2015-10-11 13:10:11 +02:00
phil235 6bb09c92cd derp, removing comments, adding a missing Feedstop() 2015-10-10 21:53:22 +02:00
phil235 df171284cb Slimes now uses buckling to feed and attach themselves on mobs. This removes the silly check in mob/Move(), reducing lag.
Fixes mobs being able to attach slimes onto other mobs.
2015-10-10 20:41:27 +02:00
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
phil235 c95d0e740d Merge pull request #12144 from Shadowlight213/MalfBrain
Makes the Ai braindead message not appear if the AI shunts
2015-10-10 12:21:17 +02:00
phil235 63a19613e6 Merge pull request #12189 from Xhuis/#freedrone
Fixes drones being unable to be revived by other drones
2015-10-10 12:05:02 +02:00
Razharas 570a18179b Merge pull request #12217 from GunHog/Scan_Visor_Is_My_Favorite_MP_Visor
Research Examines!
2015-10-10 08:35:43 +03:00
KorPhaeron 57a3e65ee7 Night Vision 2015-10-09 22:39:46 -05:00
Razharas 4c204a2335 Merge pull request #12222 from KorPhaeron/robusttendency
Medical HUD for support parasite/guardian
2015-10-10 03:33:50 +03:00
Razharas 8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
phil235 4a71185268 * Fixes butchering, it no longer does both an attack and butchering at the same time.
* Morph no longer automatically drop its content on death, you have to butcher it to retrieve the content, 10 items at a time.
* And those items are spread in a one tile radius to avoid having too many things on one tile).
*The morph also drops generic meat during final butchering (it's only because it needed to drop something to be able to be butchered, feel free to change the meat to something else)
2015-10-10 00:03:55 +02:00
CosmicScientist 01b603b73c Adds me to larva 2015-10-09 21:21:16 +01:00
Firecage d907ad6ef3 Reverts the revert of the revert 2015-10-09 17:44:12 +02:00
Aranclanos 0fccd6ffce Revert "Revert "Removes alien driveby"" 2015-10-09 12:35:43 -03:00
Swag McYolosteinen 43f90e8b3a Merge pull request #12236 from tgstation/revert-12163-aliendryby
Revert "Removes alien driveby"
2015-10-09 17:22:03 +02:00
Jordie 56c6c3f613 Merge pull request #12210 from GunHog/How_To_Train_Your_Xeno
Praetorian Promotion Fix
2015-10-10 00:10:32 +11:00
GunHog dcbcfefa01 Action buttons + More mobs!
- Scanner control is now an action button.
- Fixed multiple scanner bugs (I think)
- Gave ability to drones and borgs.
2015-10-08 11:30:39 -05:00
Cheridan 136140614d Merge pull request #12151 from AnturK/larvafix
Misc Fixes
2015-10-08 07:20:30 -05:00
phil235 0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled.
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
KorPhaeron 6095956059 Changes 2015-10-07 14:41:06 -07:00
Razharas 92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
Sleeping Carp changes
2015-10-07 22:25:11 +03:00