Commit Graph

316 Commits

Author SHA1 Message Date
Yoshax 3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION
Properly alphabetizes lavender in the vending machines.
2016-07-13 17:10:10 +01:00
Serithi 8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
Zuhayr 764c78b25f Ported and rewrote several cooking machines from Apollo by request.
# Conflicts:
#	maps/exodus/exodus-1.dmm
2016-06-29 13:59:24 -04:00
Datraen caac4c5838 Randomized Plant Update (#1805)
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
2016-05-31 15:08:42 +01:00
Yoshax df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00
Yoshax cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Datraen 4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Serithi c4df745933 Better formatting. 2016-05-25 17:45:48 -07:00
Serithi b7158b5acd Apparently i added the seeds to the wrong seed vendor file. Hoooopefully this is all that's needed now. 2016-05-25 17:24:22 -07:00
Serithi 74f72c8e25 Adds in lavender. Doesn't need much nutrient or water (assuming i did the numbers right, feel free to fix them if i did a dumb), contains a small amount of bicard, and is purple. What more could one want from a flower? 2016-05-25 13:08:33 -07:00
Datraen 79e22d58e5 Semi-final stage of Xenobio2 Initial Implementation
Adds UIs to Core Extractor, Slime Replicator
Adds Slimified Monkey Cubes as separate item type
Adds Docility Toxin
Replaces amutationtoxin references with docilitytoxin references
Adds resistances to simple_mob damage handling, to allow for simple mobs to have resistances to different kinds of damage
Moves a return to it's proper position to allow for hostile mobs to properly handle targets.
2016-05-25 03:50:23 -04:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
HarpyEagle 3ae1f9ed78 Updates more instances of blocked<2 or /=(blocked+1)
Removes facehugger source code file
2016-04-22 21:04:31 -04:00
mwerezak deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2016-04-22 04:57:23 -04:00
mwerezak 11c5b10bb9 Refactors various item attack() implementations
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
mwerezak 593f7699db Refactors item_attack.dm
Refactors and cleans up item_attack.dm and related mob attack code

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items.dm
	code/modules/mob/living/bot/bot.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:52:04 -04:00
Kelenius 98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Hubblenaut 3a45ceee64 Full fertilizer bottles of type glass/bottle 2016-03-30 19:42:13 +02:00
SinTwo b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Neerti a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Kelenius 1683761d6a Fixes #1171 2016-03-21 14:22:44 +03:00
Datraen fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Neerti b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Kelenius acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Kelenius bcc5127a69 Sprites for drying racks, bees for hydroponics
Adds distinct sprites for drying racks, taken from /tg/.
Remaps hydroponics a bit and adds a crate with beekeeping necessities.
Fixes a typo in the smoker.
http://imgur.com/eaDmbPE
http://imgur.com/wywJ9j3
2016-02-20 14:34:54 +03:00
Zuhayr cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Ithalan 9db3c3e268 Fixes plant analyzer not showing information about gasses consumed or released
Fixes hydroponics trays not showing sensor information when empty
2016-02-13 22:05:18 +01:00
Kelenius e017b3f4ba Fixes trays not processing reagents
#921
2016-02-08 12:00:49 +03:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr 115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Zuhayr 408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across
the board.
2016-01-31 11:49:14 +10:30
Zuhayr d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Jon cbbb1f8344 Fight me 2, fight me boogaloo. 2016-01-24 00:47:52 +00:00
Jon 706d720757 Fight me etc. 2016-01-24 00:35:23 +00:00
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr d2e092c899 Diona nymphs and fruit are now able to be holstered. 2015-12-11 15:52:22 +10:30
PsiOmegaDelta 9b1123cbaa Replaces misc. checks with usr.incapacitated(). 2015-11-24 14:05:04 +01:00
PsiOmegaDelta e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
PsiOmegaDelta 26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01: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
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
Datraen a1757ee696 Removes acetone and hydrazine from the chem list. 2015-11-05 19:41:04 -05:00
Datraen 6660b6f61c Tweaks plants to create a more diverse selection, different environment constants. 2015-11-05 18:43:05 -05:00