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
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
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
mwerezak
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
Chinsky
8c8b5a34d3
Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
...
Blob spawn locations are now more random
2015-10-14 03:24:28 +03:00
PsiOmegaDelta
3b5990121f
Blobs locations are now more random.
...
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.
Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
Datraen
7856ca948d
[BOTANY] Seed Fixes
...
Fixes seed storage, adds gas scanning properties to scanner
2015-10-11 00:27:49 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
Zuhayr
95f270ad3a
Xenomorph Queens can now infest victims.
2015-09-21 20:36:51 +09:30
Zuhayr
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
PsiOmegaDelta
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
PsiOmegaDelta
232dd5bfb1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02:00
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
