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
34a2b3be5b
Flying animals no longer triggers mines and mousetraps.
...
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
d60df6ea2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
...
Conflicts:
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/living_defines.dm
2015-04-07 01:06:38 +02:00
1f6a6b0e8c
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
dd1dac556b
Fixes a mob's pull not being broken when that mob is thrown.
2015-04-06 19:11:38 +02:00
8499413649
Makes living/verb/resist more object oriented.
...
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
e04c9ac072
Fixes goat not producing milk and not retaliating.
...
Fixes bear not being able to attack you when it's AI is asleep and awaken by finding you as target.
Fixes many hostile animals not having their own attack verb text or attack sound.
Fixes goat moving even when pulled.
GiveTarget() is now called by FindTarget (because it was always called after every instances of FindTarget, and this solves the lack of retaliation).
2015-04-05 20:30:39 +02:00
9c6c68b81a
Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas)
2015-04-05 01:55:27 +01:00
ccbb042606
Fixes for DNA spread and transformation
2015-04-05 09:17:51 +12:00
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
e2d8b62620
Reduces penalty to movespeed from being cold
...
It kicks in at a lower body temp and the slowdown is less harsh. You move noticeably faster than space wind, which was the goal here.
2015-04-04 03:08:24 -07:00
6d34032385
Merge pull request #8628 from Fayrik/AllTheSmallThings
...
Someone called for pest control?
2015-04-04 20:58:07 +11:00
3bb6cc8af9
Merge pull request #8625 from xxalpha/cyberplus
...
Cyber Implants +
2015-04-04 20:57:48 +11:00
13a6a51550
Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately
...
Removes slowdown from Reactive Teleport Armor and increases activation chance
2015-04-04 20:57:33 +11:00
19af7bd19e
Merge pull request #8570 from RemieRichards/FireSpread
...
Fire spread on mob touch
2015-04-04 20:56:58 +11:00
7dbd8b1d02
Merge pull request #8706 from phil235/WeakenedFix
...
Fixes weakened/stunned/paralysis not going down naturally for aliens.
2015-04-04 20:56:32 +11:00
493c3e038a
Splitting food.dmi into smaller files.
...
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
0bd95eaa54
Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL"
2015-04-02 21:13:50 -05:00
c5a7b174ed
Fixes many mobs who should be non dense and with PASSMOB flag.
...
Removes the update_slimes var from mob/living
2015-04-03 00:33:23 +02:00
b2ed381d86
No more dense butterflies pushing mobs.
2015-04-02 23:49:04 +02:00
e834781427
Fixes weakened/stunned/paralysis not going down naturally for aliens.
2015-04-02 23:25:08 +02:00
09df1080e9
Some adjustments:
...
Fixes with projectile bump() on border objects.
Fixes some projectile on_hit() not calling the parent on_hit.
Move projectile mob hit check code to mob/CanPass().
Simplifies projectile/CanPass()
Fixes runtime in projectile/Bump()
2015-04-02 17:39:02 +02:00
4c1c55906f
Merge pull request #8666 from phil235/AnimalsUpdatehealthFix
...
Fixes simple_animals being immune to fire damage melee attacks.
2015-04-02 20:16:18 +11:00
89a8e8dea4
Fixes Reactive Teleport Armor
...
- Makes the armor actually teleport again!
2015-04-01 21:14:02 -05:00
c9e7d949e1
Buffs teleportation chance to 50 percent!
...
- Also prepares the ritual sacrifice to the Eternal Jordie, God of
Changelogs.
2015-04-01 20:49:42 -05:00
6e83015145
fixes critical priority bug
...
jesus christ think of all those g's. jesus fucking christ. what have we done
2015-04-01 21:49:14 -04:00
c5b5427b0e
Makes projectile non dense. Projectile hitting a dense obj/turf will now also hit one of the mob sitting on that turf/obj's turf.
...
Adds a has_limb var to mob/living to handle whether to specify the limb that is hit by a projectile or not.
Fixes runtime in handle_changeling.
Adds PASSMOB pass_flag and mob_size small to bees and mouse.
2015-04-01 20:59:42 +02:00
35498dc200
Merge pull request #8686 from sawu-tg/npcpool
...
Fixes to SNPCs
2015-04-01 11:47:57 -07:00
799eadb6c8
Fixes to SNPCs
...
* Fixes two runtimes (stat menu and taking a delegate/assistant)
* Fixes SNPCs not being inserted into the NPCPool
* Makes the NPCPool fire more often for maximum robustness.
2015-04-02 05:19:21 +11:00
e886207f58
Merge pull request #8684 from Cheridan/chem_farts
...
AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL
2015-04-01 18:29:25 +02:00
053046c970
typo fix
2015-04-01 06:28:23 -05:00
691411c76c
Merge pull request #8648 from Cheridan/collared
...
Fixes collar stuff
2015-04-01 18:45:02 +11:00
904b27dcd7
Merge pull request #8607 from Iamgoofball/fuck
...
Fixes *flip
2015-04-01 18:44:20 +11:00
86a1c9927a
removes feedback msg, fixes checks
2015-03-31 20:13:09 -07:00
9261196b4f
Fixes simple_animals being immune to fire damage melee attacks.
...
Fixes slime being able to latch onto other slimes with mouse_drop (but not the feed verb)
2015-03-31 21:29:34 +02:00
2d94da8e59
Merge pull request #8592 from phil235/AlienAttackBlob
...
Fixes alien humanoids not being able to attack blobs.
2015-03-31 19:11:12 +11:00
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
3865495994
Fixes collar stuff
2015-03-30 18:22:25 -05:00
Cheridan