Commit Graph

455 Commits

Author SHA1 Message Date
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
AndrewJacksonThe2nd
583c2c3dea Fixes 2016-02-21 15:46:16 -08:00
KorPhaeron
8383552ef8 Carrot fix 2016-02-07 15:36:37 -06:00
KorPhaeron
e26dd3eb39 Fixes carrot/biobag interaction 2016-02-07 14:40:10 -06:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
phil235
81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
duncathan salt
0915bcf78c Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot
carrot shivs strike back
2016-02-02 19:04:20 -06:00
PKPenguin321
f001077b1a fixes the extraneous line removals
hopefully
2016-01-30 15:54:39 -08:00
PKPenguin321
1b4b672af9 carrot shivs
git went rough on my ass and im not happy about it
2016-01-29 22:05:47 -08:00
erwgd
cffdb3f684 Removes wheat-to-rice mutation 2016-01-30 02:09:56 +00:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00