Commit Graph

742 Commits

Author SHA1 Message Date
skull132
443a49a49b Merge branch 'master' into development 2016-07-10 14:25:54 -04:00
LordFowl
a6c1085e37 Fowl's Bugfixes 1 (#521) 2016-07-10 01:13:29 +03:00
skull132
5006341832 Merge branch 'master' into development 2016-07-05 16:15:39 -04:00
NanakoAC
1ecd7629ae Safeties for sprays, fixes #403 (#516)
Pepperspray no longer makes a spraying sound when the safety is on
Spraybottles can now be locked with an alt click
2016-07-05 23:33:56 +03:00
Alberyk
fe50c59d19 Adding unique drinks from old code (#452)
Porting some unique alcohols from the old code.
2016-07-05 21:21:48 +03:00
Alberyk
800c207e2d Fix #460 (#501)
No more lethal syringe invisible sprite. This should fix #460 .
2016-06-30 01:34:35 +03:00
LordFowl
56e288e910 Vaurca Content 2 (#426)
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
NanakoAC
6881213b75 Nutrition Rearranging, Skrell and Unathi diets (#331)
* Nutrition Rearranging, Skrell and Unathi diets

*Rearranged nutrition code a little - Added a Digest proc and put the
three stat changing lines in there (blood, nutrition, healing) to
standardise it. and reduce code duplication
*Added blood_factor and regen_factor variables to nutriment, to easily
set how much bloodrestore or healing an inherited food will do. This
reduces numeric literals in code
*protein now has a blood factor of 12 instead of 6
*Unathi now cannot digest nutriment, it will do nothing.
*Added seafood protein as a descendant of protein.
*Skrell can safely eat seafood protein (By Senpai Jackboot's request)
*Space Carp, and all recipes made with carp fillets, now contain seafood
protein instead of animal protein, and thus are safe for skrell to eat.
*Skrell are now immune to carpotoxin

* Altered Carpotoxin immunity

After feedback from senpai jackboot, carpotoxin is taken away from
skrell, and given to unathi instead.
2016-05-30 23:29:56 +03:00
NanakoAC
a96d655632 Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility
*Sterilizine will now reduce the germ level of all wounds on the mob on
contact, proportional to the quantity sprayed
*Spraybottles will now display the "<Person> sprays <otherperson> with
the <spraybottle>" message when spraying on any mob
2016-05-22 10:53:04 +01:00
skull132
af73877426 Merge pull request #310 from skull132/vampire_rewrite
Vampire rewrite
2016-05-18 22:03:04 +03:00
LordFowl
f85e66640b Compatibility Patch
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
2016-05-05 20:32:40 -04:00
LordFowl
c7ca0887e7 Vaurca Changes
Various vaurca-based changes, as detailed in the changelogs.
2016-05-05 19:10:05 -04:00
skull132
3e8ac5ee39 Vampire Re-write: Block 1
The largest chunk of this rewrite.

Reworks the vampire powers, and makes them completely modular, as with changeling. Also adds a few powers, and so on.

A massive list of TO-DOs remains.
2016-04-26 20:29:14 +03:00
skull132
3d3dbcb8f0 JMP logs for days
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
PsiOmegaDelta
1c04164a2a Can now expand monkey cubes.
Apparently open containers don't call afterattack. Marks monkey cubes as closed. Fixes #12085.
2016-01-31 14:19:54 +01:00
PsiOmegaDelta
21c8920271 Fixes food and radiocarbon spectrometer reagent injection.
Fixes #11913. Fixes #12048.
2016-01-27 11:22:46 +01:00
Ryan784
5f655dbbdb Vampire Gamemode Developement Test
The Vampire gamemode, as ported right now. The gamemode is in, as well
as creating a vampire through the traitor panel. All abilities seem to
function, unable to test enthrall however (though I have a feeling it
will have to be redone). Enthralling someone without a CKey will give
you the correct response, however.

Any abilities having to do with lums will need to be redone. Vamphud as
well.

If looking over this and pointing out errors/fixing is faster than
simply porting it yourself, then feel free to do so!
2016-01-20 22:14:21 -05:00
Hubblenaut
0aa4f10013 Center_of_mass for snacks/dishes 2016-01-17 16:12:02 +01:00
PsiOmegaDelta
e745093acc Corrects snack macros. 2016-01-14 08:42:24 +01:00
Zuhayr
cc4c86c995 Fixes #270 2016-01-14 08:37:10 +01:00
PsiOmegaDelta
1e86e42359 Removes jar slime handling, whatever it was supposed to be. Fixes #11689. 2015-12-23 13:46:31 +01:00
PsiOmegaDelta
185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
2015-12-08 08:09:37 +01:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
Zuhayr
f2a7536807 Mops can now be wet in buckets or sinks. 2015-12-01 02:05:27 +10:30
Zuhayr
958e11387d POCKET SAND! 2015-12-01 02:04:10 +10:30
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means.
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
2015-10-22 16:52:07 +02:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta
4c96cd62a7 Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. 2015-10-20 17:11:55 +02:00
HarpyEagle
e24313be2e Fix macro 2015-10-15 07:02:57 -04:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
GinjaNinja32
e29f5d108c fix pill attack_log entry, switch to using key_name 2015-09-14 06:24:49 +01:00
mwerezak
26f1d02bda Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-09-11 18:13:14 -04:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
mwerezak
8e66d3b31a Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
2015-09-09 19:49:46 -04:00
mwerezak
a58f70025d Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent. 2015-09-09 15:44:46 -04:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
mwerezak
6e66ad307c Refactors bottle smashing, apply_hit_effect() now returns the blocked status. 2015-09-09 13:58:45 -04:00
Chinsky
72d768808a Merge pull request #10110 from mwerezak/shields
Better shield handling
2015-09-03 20:38:48 +03:00
Chinsky
cf0a3f94d0 Merge pull request #10808 from Hubblenaut/dev
Bar drinks
2015-09-01 12:56:54 +03:00
Zuhayr
3f6f34c16f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi
2015-09-01 11:22:10 +09:30