Commit Graph

465 Commits

Author SHA1 Message Date
phil235
bb1f60e769 Fixes typos and errors I made.
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge
0ffeaa46fa Removes ishuman() check for beekeeping 2016-04-21 17:54:17 +01:00
RandomMarine
82e39d6a85 Implements cloth stacks 2016-04-16 11:11:16 -07:00
Cheridan
5a51d2e9f9 Merge pull request #16818 from phil235/FixSeedShit
Fixes Seed runtimes
2016-04-13 15:58:59 -05:00
phil235
0d7adf841b add_juice() can also runtime if seed is null. 2016-04-12 03:59:39 +02:00
phil235
d03a5c9343 Simplifies the build_recipe_text() proc used by tablecrafting to not create and delete an object just to get its name (replaced by the "initial()" trick).
Adds some if(seed) checks to growns code to prevent runtimes for seedless growns.
2016-04-12 03:51:45 +02:00
SamuelRowe
4809875d37 ongoing 2016-04-10 08:56:58 +12:00
erwgd
529309e6ab Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm 2016-04-04 21:20:03 +01:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
bawhoppen
af51a66e37 Adds sandbags
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
LatD
62f93b7a32 Adds hydrogen to grass 2016-04-01 00:09:33 +03:00
erwgd
5fc02ccee8 moved all returns in generation ifs to new lines 2016-03-31 15:14:28 +01:00
erwgd
0109c274fb moved returns to new lines, put 10u black pepper 2016-03-31 15:09:45 +01:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
erwgd
ec3a9066f8 moved pepper buttons away from rows of dairy product buttons in biogenerator.dm 2016-03-29 19:38:57 +01:00
erwgd
c1c255a663 Fixed weed and pest killer bottles; added empty botany bottles; added empty bottles and black pepper to biogenerator; formatting edits in biogenerator.dm and descriptions added to bottles in hydroitemdefines.dm 2016-03-29 19:26:49 +01:00
Remie Richards
17defb66d4 Bee fixes and updates!
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
2016-03-27 21:07:53 +01:00
Remie Richards
9f5114ee51 istype -> ishuman 2016-03-24 20:38:15 +00:00
Remie Richards
b9a2c7fdfe Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
Conflicts:
	icons/mob/head.dmi
2016-03-23 15:41:58 +00:00
Remie Richards
56e5a3cea3 Here come the nerfs, all dressed in your tears~
* Plant Health gained per pollination is now half the bees health (down from all the bees health, which was only 10 max anyway)
* Pests are now only reduced in 33% of pollinations (33% chance to reduce pests, down from 100%)
* Yieldmod is now only increased 5% of the time (down from 100%)
* Yieldmod is now a new variable, innate_yieldmod on plants, this is so having bees and THEN using chemicals on the plants doesn't magically undo the bee's work, it is added onto the yield mod of the tray.
* To make up for the above, there is now a 50% chance per pollination (up from 0%) for the potency (how many reagents the plant gets) to go up by 1, this isn't much, but 50% of the time adds up
2016-03-23 15:36:20 +00:00
KorPhaeron
6df3dd47d6 Merge pull request #16266 from Lumipharon/botany5001
Makes some plants a bit better
2016-03-22 19:24:59 -05:00
Remie Richards
ed8ca553b4 Fixes, Improvements, Feedback - Wave 1 2016-03-21 18:05:28 +00:00
Lumipharon
acb3941312 Improved various plants and added extra chemicals to others - Being a botanist should now be more FUN. 2016-03-22 00:07:11 +13:00
Remie Richards
d331d54add fixes queen bees being counted multiple times, interrupting hive growth 2016-03-21 06:29:30 +00:00
Remie Richards
bbd30fb970 fixes typo that prevented bees from starting to grow naturally. 2016-03-21 05:38:53 +00:00
Remie Richards
9aaf4ffc40 Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
Conflicts:
	icons/obj/hydroponics/equipment.dmi
2016-03-21 05:03:33 +00:00
Remie Richards
be0b16a6aa Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
2016-03-21 04:51:16 +00:00
c0
d513f52244 Adds Plant Samples for future use 2016-03-15 04:29:36 +03:00
c0
a707a54489 fixes broken sprites and broken clown banana 2016-03-14 09:30:11 +03:00
c0
e4f2d0c064 Bioengineering Part 1 2016-03-13 13:20:26 +03:00
c0
6b7774a1de fixes 2016-03-11 09:52:20 +03:00
c0
410ad60750 fix 2016-03-09 09:30:07 +03:00
c0
240fd5bc05 Plant Refactor: Genesis 2016-03-09 09:29:37 +03:00
c0
08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
c0
9f302e6ed4 Fixes a nasty banana teleport bug 2016-03-07 05:38:47 +03:00
c0
3d0792c003 Plant Refactor: Icons 2016-03-07 05:38:45 +03:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
c0
f33813feda quickfix 2016-03-04 05:20:33 +03:00
c0
3c06668e0c Adds proc for checking all the plants for broken in-tray icons 2016-03-04 05:06:17 +03:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
c0
b6ff8f5919 Splits grown.dm into subfiles completely 2016-03-03 06:13:12 +03:00
c0
0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
Sestren413
fd7047f43f Added them to the banana mutation list 2016-02-28 22:33:44 -06:00
Sestren413
5edb20d18b Made changes based on feedback 2016-02-27 18:52:51 -06:00
Sestren413
3b4616157f Added code and icons for bluespace bananas 2016-02-27 15:45:04 -06:00
Cheridan
d80756ce9e Merge pull request #15745 from KazeEspada/TreeCutting
Tree cutting
2016-02-26 08:40:29 -06:00
KazeEspada
8aeb2678e0 You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts. 2016-02-24 23:15:19 -07:00