Commit Graph

642 Commits

Author SHA1 Message Date
Zuhayr c569d52700 Fixes pretzels being unmakable (use a poppy instead of the seeds) 2014-12-13 22:46:55 +10:30
Zuhayr ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Zuhayr 3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr a7d526f8b1 Fixes #7119 2014-12-08 03:51:21 +10:30
Zuhayr a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
Zuhayr a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
Zuhayr 66c6c0f270 Amendment to the previous. 2014-11-23 10:15:31 +10:30
Zuhayr 5568ed15c1 Randomizes strange seed icons, fixes poppies. 2014-11-23 10:15:15 +10:30
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Zuhayr 40e3ea33f6 Merge resolution. 2014-11-13 16:07:16 +10:30
Zuhayr b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
runedog48 457e398dac Fixes #6957 2014-11-08 18:11:35 -05:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega 55e44e1523 Fixes #6868
See https://github.com/Baystation12/Baystation12/issues/6868#issuecomment-60784011
2014-10-28 18:05:04 +01:00
Zuhayr e4ff1a3088 Hydro tweaks, fixes #6808 2014-10-21 09:10:23 +10:30
Zuhayr ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr b78e2b0c79 Fixes #6297 2014-09-25 21:49:20 +09:30
Zuhayr 6bdf515ef3 Makes species mutation a bit easier. 2014-09-25 18:48:29 +09:30
Zuhayr 7682711442 Fixes #6474 2014-09-25 18:45:27 +09:30
Zuhayr 4bedceca78 Hydro tweaks. 2014-09-18 21:45:12 +09:30
Zuhayr afde93e94d Adds random seeds to Cargo for Xenobotany. 2014-09-18 16:39:44 +09:30
Zuhayr c83c6b652e Compiile fix. 2014-09-17 00:51:20 +09:30
Zuhayr 46f361e907 Several tweaks/fixes for newhydro. 2014-09-17 00:43:33 +09:30
Zuhayr b819b7297a Fixes several outstanding bugs with new hydroponics. 2014-09-10 20:02:34 +09:30
Zuhayr 7b366f092d Fixes some issues with new Hydro. 2014-08-27 22:04:19 +09:30
mwerezak 03e557823c Fixed #5912
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
Zuhayr fcd1c73b17 Adjusted gas exude code. 2014-07-30 20:54:36 +09:30
Zuhayr e2e039f72a Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-07-30 12:39:28 +09:30
Zuhayr ca59536e06 Reapplying some fixes that I think DM may have saved over, whoops. 2014-07-30 12:34:36 +09:30
Zuhayr 251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30
Zuhayr 89be9e5f43 More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-07-29 13:24:52 +09:30
Zuhayr 7b084ed349 Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 12:38:21 +09:30
Zuhayr 7f6b36e1dc Fixes some transposed values. 2014-07-29 00:25:46 +09:30
Zuhayr f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
Zuhayr 4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr 976cb4f844 Fixed seeds not showing up properly in the vendor. 2014-07-27 03:19:43 +09:30
Zuhayr 69b397b5c4 Compile fix. 2014-07-26 01:42:05 +09:30
Zuhayr 7fb8f30cc7 New machines, adjusted Cael's seeds, rewrote space vines. 2014-07-25 22:15:33 +09:30
Chinsky be95e54e43 Merge branch 'master' into dev
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
Zuhayr 4244479e43 Reapplying some changes. 2014-06-12 01:23:32 +09:30
igalan 7d08d4701c Hydroponics refactor, part 1: Files.
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
2014-06-11 03:44:29 +01:00