6807b1ae48
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
bc71b4b8b3
* Fixes observers not seeing abductor hivemind
...
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
4c1a1c8c87
Merge pull request #8967 from phil235/BundleFix1
...
A big bundle of fixes
2015-04-16 18:18:53 +10:00
4468cf7bc5
Merge pull request #8935 from Incoming5643/deep_fried_lizards
...
Extra mutantrace parts won't hold color if the body gets husked
2015-04-15 08:29:26 -05:00
6c1117c14d
Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
...
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
63b590d1c8
Merge pull request #8950 from Incoming5643/malfunction_junction_whats_your_major_malfunction
...
Fixes malf powers being broken
2015-04-14 17:22:31 -05:00
a584b8df0e
woops
2015-04-14 20:30:02 +02:00
882ab28794
derp, wrong PR.
2015-04-14 19:09:57 +02:00
0f6a60600d
Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
...
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +02:00
081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
507084a0c2
conflicting with myself
2015-04-13 21:01:25 -04:00
d10454e810
buffs head slugs a bit:
...
Head slugs can now vent crawl (they're so tiny why didn't they already have this?)
Head slugs can stumble around for 10 seconds after they lay their egg so they don't die super obviously right next to their infected corpse
2015-04-13 20:56:54 -04:00
68eb02adbd
Fixes malf powers being broken because canusetopic was never a thing for AIs before this point
2015-04-13 17:40:28 -04:00
11603451df
Merge pull request #8577 from Iamgoofball/spin
...
CRITICAL LAG FIX FOR SINGULARITIES AND THROWING
2015-04-13 20:39:08 +02:00
6fa8e5f02d
Adds Abduction Mode
2015-04-13 18:40:15 +02:00
c3801757de
Merge pull request #8892 from phil235/PiniataPeteFix
...
Fixes the meat type of many simple animals
2015-04-13 18:24:13 +10:00
86f5b381a3
Merge pull request #8884 from Incoming5643/Ooo_whatcha_say
...
adds speak emote to a lot of simple animals that lacked them
2015-04-13 18:23:51 +10:00
e6143f6493
Merge pull request #8810 from AnturK/everybodywaskungfufighting
...
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
becdb6fcc3
Merge pull request #8746 from ACCount12/diseasesfixes
...
Fixes for DNA spread and transformation diseases
2015-04-13 18:22:21 +10:00
ae120db87c
Merge pull request #8728 from AnturK/action_button
...
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
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
c473447bc3
Merge pull request #8877 from xxalpha/jetpackfix
...
Fixed inbuilt jetpack not working for syndicate hardsuit.
2015-04-12 13:34:02 -05:00
141d577bba
Merge pull request #8895 from phil235/WindowFix
...
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
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
853009f7e0
Merge pull request #8157 from Xhuis/shadowling_gamemode
...
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
c9338f7212
Shadowling: RELEASE EDITION
2015-04-11 11:42:02 -04:00
42699ad4b4
- Made hide/show button mesh better
2015-04-11 17:06:45 +02:00
f0bc1cc70c
- Adds action buttons for aliens
2015-04-11 17:06:44 +02:00
e2c869bc77
- Adds generic action and action buttons system
2015-04-11 17:06:43 +02:00
260d205598
- Adds Martial Art datum and Three styles
2015-04-11 16:32:20 +02:00
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
81da573b8d
adds speak emote to a lot of simple animals that lacked them
2015-04-10 18:44:51 -04:00
2ef8e76560
Merge pull request #8785 from AnturK/alien_proc_holder
...
Turns alien abilities into proc holders
2015-04-10 21:19:49 +02:00
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
43f03f5a08
Merge pull request #8855 from AnturK/slug_fixes
...
Headslug fixes
2015-04-10 20:50:04 +02:00
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
dcdb922d04
Fixed inbuilt jetpack not working for non engine hardsuits.
2015-04-10 18:08:52 +01:00
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
2b83512dc9
- Headslug fixes
2015-04-09 12:44:21 +02:00
3ed097265f
Fix #8851
...
also fixes unbucking and cuff breaking.
2015-04-09 17:18:22 +09:00
58a362b2f1
Merge pull request #8822 from sawu-tg/blackface
...
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
2015-04-09 00:20:23 -05:00
e6e0143ec5
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/MiniStation/z2.dmm
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
a0ea5dfefe
Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/cat.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
code/modules/mob/living/simple_animal/friendly/lizard.dm
code/modules/mob/living/simple_animal/friendly/mouse.dm
code/modules/mob/living/simple_animal/hostile/bees.dm
2015-04-08 19:10:20 +02:00
fdcae0a7ba
- Turns alien abilites into proc holders
2015-04-08 16:56:43 +02:00
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
654a332d21
Removes the Mutant_colors config option because anyone who's apt to turn on mutant races for joining doesn't want them to all look EXACTLY THE SAME (That's racist guys)
2015-04-08 01:24:55 -04:00
6103b2a5e1
Fixes Spraycans not coloring faces correctly
...
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
4554d54229
Merge pull request #8765 from phil235/UdderFix
...
Fixes goat not producing milk and not retaliating.
2015-04-07 19:29:12 -05:00
028b40ecd1
I hate fixing merge conflicts.
2015-04-07 20:51:47 +02:00
6b83575b28
Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
...
Conflicts:
code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
phil235
AnturK
Jordie
Cheridan
Swag McYolosteinen
Incoming
Xhuis
phil235
xxalpha
bear1ake
Sawu