Commit Graph

234 Commits

Author SHA1 Message Date
Bedshaped
f0df1746f8 Bedshaped's Best Bugfixes #1 (#654)
Fixes #505 (again)
Fixes #626 
Fixes #647 
Resolves #509
2016-08-02 21:47:37 +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
skull132
5d85c7c06f Merge remote-tracking branch 'origin/master' into development 2016-06-22 10:56:26 -04:00
NanakoAC
e70157ebfc Botany Tweaks (#389)
Watering hydroponics trays with a bucket of water will no longer waste
the excess water.
Fertilizer bottles now contain 60u. Amounts in vendors and biogenerator
cost adjusted appropriately
2016-06-20 17:34:30 +03:00
LordFowl
013eb1c466 Vaurca Bugfix #1.1 (#364)
* Vaurca Bugfix

New Vaurca bugfix. Fixes lack of seeds in seed storage, Vaurca spawning
without shoes.
2016-06-01 21:11:42 +03:00
skull132
39bf9b2304 Fixes #299 (#352) 2016-05-30 23:48:03 +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
3d3dbcb8f0 JMP logs for days
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
skull132
a9110a97d4 Fixes #61
Ports https://github.com/PolarisSS13/Polaris/pull/932 and https://github.com/Baystation12/Baystation12/pull/11818
2016-02-21 22:54:22 +02:00
Datraen
301f7f5c8d Fixes #11489, fixes labels as well 2015-11-20 19:37:00 -05:00
Datraen
a79a8746e0 Fixes #11489 2015-11-20 18:30:52 -05:00
Zuhayr
959e15826b Fixes grown food not leaving trash. 2015-11-20 20:02:05 +10:30
FalseIncarnate
4a9dc8dc8f Invisible / Missing Growth State Fix
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
2015-09-14 17:35:33 -04:00
Datraen
05a29f8f3a [BOTANY] Fixes plant storage nutrient check
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30
Zuhayr
e4fdf84ef7 Fixes #10054, fixes some mushroom issues. 2015-07-09 04:25:36 +09:30
PsiOmegaDelta
f1a790f162 Fixes duplicate var definition. 2015-07-08 09:05:55 +02:00
PsiOmegaDelta
e18472c444 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/datums/ai_laws.dm
	code/modules/hydroponics/spreading/spreading.dm
2015-07-08 08:57:48 +02:00
Zuhayr
89f93d4aac Fixes an issue with plants. 2015-07-08 16:08:59 +09:30
mwerezak
8925a5b23e Stops sampling from being a means of fighting vines
Vines can now only be sampled once mature, can only be sampled
periodically, and take less damage from sampling.
2015-07-05 20:59:23 -04:00
Zuhayr
572a480679 Merge pull request #9723 from atlantiscze/plant-fix
Fixes #9706
2015-06-13 01:38:47 +09:30
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
Zuhayr
48b063a96e Fixes #9620 2015-06-10 23:14:33 +09:30
Zuhayr
4b04b867ac Fxes #9625 2015-06-10 23:14:32 +09:30
Atlantis
0135051498 Fixes #9706
- Adds checks whether the turf exists. This should prevent runtimes.
- Moves ..() call in food/snacks/grown after seed.thrown_at() call. I believe this was causing the runtime in first place.
2015-06-07 06:43:50 +02:00
Zuhayr
04d1b40e3d Merge pull request #9626 from GinjaNinja32/vine_event_fix
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
GinjaNinja32
24adb8eb42 Fixes vine/infestation events not working with new lighting
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
Zuhayr
21a019b34f Cleanup 2015-05-30 05:35:00 +09:30
Zuhayr
a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
Zuhayr
887b8163cc Fixes #9498 2015-05-30 02:56:01 +09:30
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Zuhayr
f72203c611 Set vine mouse opacity to 2. 2015-05-18 22:07:00 +09:30
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
GinjaNinja32
137c77c19d Typo fix 2015-05-16 10:48:59 +01:00
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Zuhayr
fe3f169959 Fixes #9234 2015-05-15 13:53:01 +09:30
Zuhayr
30cda10bb3 Fixes #9226 2015-05-15 13:43:28 +09:30
Zuhayr
1dfade1a33 master>dev 2015-05-13 17:09:57 +09:30
Chinsky
009dc181b2 Merge pull request #9203 from mwerezak/vines2
Updates weed control crate
2015-05-12 15:58:47 +03:00
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
PsiOmegaDelta
b30465374d Merge pull request #9201 from GinjaNinja32/vine
Fixes vines not being vines.
2015-05-12 07:04:41 +02:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30