Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
This commit is contained in:
Poojawa
@@ -9,7 +9,7 @@
|
||||
return {"Our military presence is inadequate in your sector.
|
||||
We need you to construct BSA-[rand(1,99)] Artillery position aboard your station.
|
||||
|
||||
Base parts should be availible for shipping by your cargo shuttle.
|
||||
Base parts are available for shipping via cargo.
|
||||
-Nanotrasen Naval Command"}
|
||||
|
||||
/datum/station_goal/bluespace_cannon/on_report()
|
||||
|
||||
@@ -30,15 +30,15 @@
|
||||
.++
|
||||
|
||||
/datum/station_goal/dna_vault/get_report()
|
||||
return {"Our long term prediction systems say there's 99% chance of system-wide cataclysm in near future.
|
||||
We need you to construct DNA Vault aboard your station.
|
||||
return {"Our long term prediction systems indicate a 99% chance of system-wide cataclysm in the near future.
|
||||
We need you to construct a DNA Vault aboard your station.
|
||||
|
||||
DNA Vault needs to contain samples of:
|
||||
The DNA Vault needs to contain samples of:
|
||||
[animal_count] unique animal data
|
||||
[plant_count] unique non-standard plant data
|
||||
[human_count] unique sapient humanoid DNA data
|
||||
|
||||
Base vault parts should be availible for shipping by your cargo shuttle."}
|
||||
Base vault parts are available for shipping via cargo."}
|
||||
|
||||
|
||||
/datum/station_goal/dna_vault/on_report()
|
||||
@@ -85,7 +85,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey,/mob/li
|
||||
if(!H.myseed)
|
||||
return
|
||||
if(!H.harvest)// So it's bit harder.
|
||||
user << "<span clas='warning'>Plants needs to be ready to harvest to perform full data scan.</span>" //Because space dna is actually magic
|
||||
user << "<span clas='warning'>Plant needs to be ready to harvest to perform full data scan.</span>" //Because space dna is actually magic
|
||||
return
|
||||
if(plants[H.myseed.type])
|
||||
user << "<span class='notice'>Plant data already present in local storage.<span>"
|
||||
@@ -98,7 +98,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey,/mob/li
|
||||
if(isanimal(target))
|
||||
var/mob/living/simple_animal/A = target
|
||||
if(!A.healable)//simple approximation of being animal not a robot or similar
|
||||
user << "<span class='warning'>No compatibile DNA detected</span>"
|
||||
user << "<span class='warning'>No compatible DNA detected</span>"
|
||||
return
|
||||
if(animals[target.type])
|
||||
user << "<span class='notice'>Animal data already present in local storage.<span>"
|
||||
@@ -266,13 +266,13 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey,/mob/li
|
||||
H << "<span class='notice'>Your lungs feel great.</span>"
|
||||
S.species_traits |= NOBREATH
|
||||
if(VAULT_FIREPROOF)
|
||||
H << "<span class='notice'>Your feel fireproof.</span>"
|
||||
H << "<span class='notice'>You feel fireproof.</span>"
|
||||
S.burnmod = 0.5
|
||||
S.heatmod = 0
|
||||
if(VAULT_STUNTIME)
|
||||
H << "<span class='notice'>Nothing can keep you down for long.</span>"
|
||||
S.stunmod = 0.5
|
||||
if(VAULT_ARMOUR)
|
||||
H << "<span class='notice'>Your feel tough.</span>"
|
||||
H << "<span class='notice'>You feel tough.</span>"
|
||||
S.armor = 30
|
||||
power_lottery[H] = list()
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
/datum/station_goal/station_shield/get_report()
|
||||
return {"The station is located in a zone full of space debris.
|
||||
We have a prototype shielding system you will deploy to reduce collision related accidents.
|
||||
We have a prototype shielding system you must deploy to reduce collision-related accidents.
|
||||
|
||||
You can order the satellites and control systems through cargo shuttle.
|
||||
You can order the satellites and control systems at cargo.
|
||||
"}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user