Commit Graph

8983 Commits

Author SHA1 Message Date
Jordie d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Jordie e6143f6493 Merge pull request #8810 from AnturK/everybodywaskungfufighting
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
Jordie becdb6fcc3 Merge pull request #8746 from ACCount12/diseasesfixes
Fixes for DNA spread and transformation diseases
2015-04-13 18:22:21 +10:00
Jordie ae120db87c Merge pull request #8728 from AnturK/action_button
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
Incoming 8344d55acd Lizard snouts/tails won't hold color if the body gets husked. In a great stroke of luck the husk grey and the default base grey for mutant races were fairly close and I didn't really have to do anything to it to make it look decent. 2015-04-13 02:17:27 -04:00
Cheridan c473447bc3 Merge pull request #8877 from xxalpha/jetpackfix
Fixed inbuilt jetpack not working for syndicate hardsuit.
2015-04-12 13:34:02 -05:00
Cheridan 141d577bba Merge pull request #8895 from phil235/WindowFix
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
xxalpha ca8870ad96 Added /obj/effect and /obj/item/weapon/gun path to Quick Create Object. 2015-04-12 18:26:24 +01:00
xxalpha cb800d3070 Added /obj/item/stack path to Quick Create Object of Game Panel. 2015-04-12 17:38:01 +01:00
phil235 b842c800a8 Fixes miner cyborg being able to eject their drill's cell. 2015-04-12 16:18:42 +02:00
Swag McYolosteinen ffd0db2b7b Merge pull request #8581 from MrPerson/lighting_2015
Object based lighting system
2015-04-12 13:14:32 +02:00
MrPerson 01a8aa662a Moved lighting stuff from controllers folder to its own module
Lighting SS no longer cares about the return of check(); the light datums are responsible for deleting themselves.
Cap on lighting effects from turfs is now 8 because they're static and shouldn't be flashing lights too often. This means starlight actually works now instead of being capped at 1 measly turf.
Lighting related ChangeTurf() code is in the lighting module. Changed it up to be faster on lighting controller init and not leave dangling lights when a turf becomes or stops being opaque or when it turns into space. This diff log is gonna be useless sadly but take my word for it, it all works.
Lighting related Moved() code is also in the lighting module. Opaque objects will now update nearby lights when they move (mechs).
Opaque objects other than the light datum's owner on the same tile as its owner will block the effect of the light. In other words a mech standing on the same square as a light bulb will block all the light of that bulb.

Changed "cheap_hypoteneuse()" with an even cheaper version; actually calculating the hypoteneuse! I can prove it's cheaper if needed.
Removed move_contents_to() because it's unused and trying to use it would cause major bugs with lights and other shit and I have no interest in supporting that, so let's not even tempt people.
2015-04-12 02:25:28 -07:00
Iamgoofball 5e908597b6 Fixes and changes Napalm Recipe
turns out I 1. forgot to make it actually produce the reagent, and 2. forgot to change the recipe
2015-04-12 01:30:02 -07:00
Iamgoofball 3d65b86f0b Fixes #8893 2015-04-12 01:26:55 -07:00
CosmicScientist 6f357b1d63 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-11 22:11:10 +01:00
Ikarrus 71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
phil235 5f169e8e47 Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.

Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.

Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.

Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.

Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
Xhuis 585fc2f62d Makes the toxin work on all species 2015-04-11 15:32:51 -04:00
Sawu 6d2678b5b3 Fixes a missing /proc/
#YOLO
2015-04-12 03:18:10 +10:00
Sawu 9555226321 Fixes usage of range() to check distance.
* Fixes all instances of SNPCs using range() to check distance, instead uses get_dist().
2015-04-12 03:08:21 +10:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK 42699ad4b4 - Made hide/show button mesh better 2015-04-11 17:06:45 +02:00
AnturK f0bc1cc70c - Adds action buttons for aliens 2015-04-11 17:06:44 +02:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
AnturK 260d205598 - Adds Martial Art datum and Three styles 2015-04-11 16:32:20 +02:00
CosmicScientist bfbc7c40a8 Should be up to date now. 2015-04-11 14:39:37 +01:00
phil235 afef61aa58 Fixes the meat type of many simple animals
Fixes the name of some steaks and cutlets when spawned.
2015-04-11 14:18:32 +02:00
CosmicScientist 0e0f8c4720 Fixed code, carp won't attack owner, corrected spelling. 2015-04-11 03:48:08 +01:00
Incoming 81da573b8d adds speak emote to a lot of simple animals that lacked them 2015-04-10 18:44:51 -04:00
phil235 f7b51889e1 Fixes invisible snacks and mobs from gold and silver slime reaction. 2015-04-10 22:54:26 +02:00
Cheridan 076fc321f0 Merge pull request #8859 from Incoming5643/gutcheck_time
Better admin/config control of mulligans + tweaks
2015-04-10 15:19:42 -05:00
phil235 2ef8e76560 Merge pull request #8785 from AnturK/alien_proc_holder
Turns alien abilities into proc holders
2015-04-10 21:19:49 +02:00
Cheridan 170c91c8b9 Merge pull request #8823 from Incoming5643/shit_lets_be_barney
Removes the mutant_colors config option
2015-04-10 14:13:24 -05:00
Cheridan 2ccebc1e3f Merge pull request #8766 from kingofkosmos/breathmaskautotoggle
Breath mask auto-adjust
2015-04-10 13:58:35 -05:00
Cheridan 5761ccde0a Merge pull request #8794 from phil235/KineticAcceleratorNerf
Nerfs the kinetic accelerator.
2015-04-10 13:56:08 -05:00
phil235 43f03f5a08 Merge pull request #8855 from AnturK/slug_fixes
Headslug fixes
2015-04-10 20:50:04 +02:00
Cheridan 04f3fbe9b1 Merge pull request #8807 from phil235/HolopadSpamFix
Holopad spam fix
2015-04-10 13:37:27 -05:00
Cheridan 94b8f0db16 Merge pull request #8733 from MrPerson/cold_slowdown_speedup
Reduces penalty to movespeed from being cold
2015-04-10 12:48:39 -05:00
Cheridan 72eacad839 Merge pull request #8854 from MrStonedOne/thisshouldmakethingseasier
Minor permission panel fixes
2015-04-10 12:40:55 -05:00
xxalpha dcdb922d04 Fixed inbuilt jetpack not working for non engine hardsuits. 2015-04-10 18:08:52 +01:00
Cheridan 4804ef1f01 Merge pull request #8843 from Wolfie13/MyFavoriteItem
Added Description Text for Pet Collars
2015-04-09 23:50:02 -05:00
Jordie 40d1c3e347 Merge pull request #8863 from Iamgoofball/patch-53
Fixes slime core dupe bug
2015-04-10 14:38:25 +10:00
Cheridan 23f31693fa Merge pull request #8739 from phil235/FoodRecipes2
A whole new bunch of foods and drinks
2015-04-09 23:28:31 -05:00
Iamgoofball 16a25f3dd8 Fixes slime core dupe bug
why the fuck this didn't throw an error is beyond me.
2015-04-09 20:49:07 -07:00
hornygranny 761985ce80 Merge pull request #8801 from xxalpha/fixfixfix
Implant Hotfix
2015-04-09 13:45:32 -07:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
phil235 13baa6e3cb Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
Conflicts:
	code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
phil235 c786ca7c54 Merge pull request #8814 from Fayrik/AllTheSmallThings
I dun goofed.
2015-04-09 17:08:53 +02:00