cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xenoflora is now a sub-department of Xenobio rather than Science.

Browse Source
This commit is contained in:
Zuhayr
2015-01-29 01:42:42 +10:30
parent 983ca55c9d
commit 06f26604d1
3 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/jobs/job/science.dm
View File

@@ -42,13 +42,13 @@
flag = SCIENTIST
department_flag = MEDSCI
faction = "Station"
total_positions = 6
total_positions = 5
spawn_positions = 3
supervisors = "the research director"
selection_color = "#ffeeff"
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher", "Xenobotanist")
alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher")
minimal_player_age = 14
@@ -74,12 +74,13 @@
flag = XENOBIOLOGIST
department_flag = MEDSCI
faction = "Station"
total_positions = 2
total_positions = 3
spawn_positions = 2
supervisors = "the research director"
selection_color = "#ffeeff"
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
minimal_access = list(access_research, access_xenobiology)
alt_titles = list("Xenobotanist")
minimal_player_age = 14

29
code/modules/hydroponics/seed_datums.dm
View File

@@ -128,9 +128,9 @@ proc/populate_seed_list()
// Cosmetics.
var/plant_icon // Icon to use for the plant growing in the tray.
var/plant_colour = "#4BC445" // Colour of the plant icon.
var/product_icon // Base to use for fruit coming from this plant (if a vine).
var/product_colour // Colour to apply to product base (if a vine).
var/plant_colour = "#6EF86A" // Colour of the plant icon.
var/product_icon // Icon to use for fruit coming from this plant.
var/product_colour // Colour to apply to product icon.
var/packet_icon = "seed" // Icon to use for physical seed packet item.
var/biolum // Plant is bioluminescent.
var/biolum_colour // The colour of the plant's radiance.
@@ -156,18 +156,21 @@ proc/populate_seed_list()
var/datum/organ/external/affecting = target.get_organ(target_limb)
var/damage = 0
if(carnivorous == 2)
if(affecting)
target << "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.display_name] greedily!</span>"
if(carnivorous)
if(carnivorous == 2)
if(affecting)
target << "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.display_name] greedily!</span>"
else
target << "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>"
damage = potency/2
else
target << "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>"
damage = potency/2
if(affecting)
target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.display_name]!</span>"
else
target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>"
damage = potency/5
else
if(affecting)
target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.display_name]!</span>"
else
target << "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>"
damage = potency/5
return
if(affecting)
affecting.take_damage(damage, 0)