coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,741 Commits 9 Branches 11 Tags
d8ef9ecb449b7e004c5c7c005fa89003c48693d8
Commit Graph

4102 Commits

Author SHA1 Message Date
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
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
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
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
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
phil235 43f03f5a08 Merge pull request #8855 from AnturK/slug_fixes 
Headslug fixes
 2015-04-10 20:50:04 +02: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
xxalpha dcdb922d04 Fixed inbuilt jetpack not working for non engine hardsuits. 2015-04-10 18:08:52 +01: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
AnturK 2b83512dc9 - Headslug fixes 2015-04-09 12:44:21 +02:00
bear1ake 3ed097265f Fix #8851 
also fixes unbucking and cuff breaking.
 2015-04-09 17:18:22 +09:00
Cheridan 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
phil235 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
phil235 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
AnturK fdcae0a7ba - Turns alien abilites into proc holders 2015-04-08 16:56:43 +02:00
Cheridan f537b43108 Merge pull request #8789 from phil235/BeartrapFix 
Pull, resist, beartraps
 2015-04-08 08:38:01 -05:00
Incoming 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
Sawu 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
Cheridan 4554d54229 Merge pull request #8765 from phil235/UdderFix 
Fixes goat not producing milk and not retaliating.
 2015-04-07 19:29:12 -05:00
phil235 028b40ecd1 I hate fixing merge conflicts. 2015-04-07 20:51:47 +02:00
phil235 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 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
phil235 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
phil235 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
phil235 dd1dac556b Fixes a mob's pull not being broken when that mob is thrown. 2015-04-06 19:11:38 +02:00
phil235 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
Cheridan 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
phil235 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
Remie Richards 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
ACCount12 ccbb042606 Fixes for DNA spread and transformation 2015-04-05 09:17:51 +12:00
phil235 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
MrPerson 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
Jordie 6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings 
Someone called for pest control?
 2015-04-04 20:58:07 +11:00
Jordie 3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus 
Cyber Implants +
 2015-04-04 20:57:48 +11:00
Jordie 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
Jordie 19af7bd19e Merge pull request #8570 from RemieRichards/FireSpread 
Fire spread on mob touch
 2015-04-04 20:56:58 +11:00
Jordie 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
phil235 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
Cheridan 0bd95eaa54 Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL" 2015-04-02 21:13:50 -05:00
phil235 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
phil235 b2ed381d86 No more dense butterflies pushing mobs. 2015-04-02 23:49:04 +02:00