cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1809 from Giacom/telesci_easymode

Browse Source 
Telescience Change
This commit is contained in:
Cheridan
2013-11-20 10:13:24 -08:00
parent 3e9b2bdb52 602a2772d2
commit c1afd57b9b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Recipes.dm
+1 -1
View File
@@ -1480,7 +1480,7 @@ datum
feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
if(holder.my_atom)
var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom))
BC.visible_message("<span class='notice'>The [BC] appears out of thin air!</span>")
BC.visible_message("<span class='notice'>The [BC.name] appears out of thin air!</span>")
//Cerulean
code/modules/research/designs.dm
+2 -2
View File
@@ -1578,9 +1578,9 @@ datum/design/bluespace_crystal
name = "Artificial Bluespace Crystal"
desc = "A small blue crystal with mystical properties."
id = "bluespace_crystal"
req_tech = list("bluespace" = 5, "materials" = 7)
req_tech = list("bluespace" = 4, "materials" = 6)
build_type = PROTOLATHE
materials = list("$gold" = 1500, "$diamond" = 3000, "$plasma" = 1500)
materials = list("$diamond" = 1500, "$plasma" = 1500)
reliability_base = 100
build_path = "/obj/item/bluespace_crystal/artificial"
code/modules/telesci/telesci_computer.dm
+6 -6
View File
@@ -12,7 +12,7 @@
var/z_co = 1
var/power_off
var/rotation_off
var/angle_off
//var/angle_off
var/rotation = 0
var/angle = 45
@@ -36,7 +36,7 @@
/obj/machinery/computer/telescience/examine()
..()
usr << "There are [crystals.len] bluespace crystals in the crystal ports."
usr << "There are [crystals.len ? crystals.len : "no"] bluespace crystals in the crystal slots."
/obj/machinery/computer/telescience/initialize()
..()
@@ -66,12 +66,12 @@
/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/bluespace_crystal))
if(crystals.len >= power_options.len)
user << "<span class='warning'>There are not enough crystal ports.</span>"
user << "<span class='warning'>There are not enough crystal slots.</span>"
return
user.drop_item()
crystals += W
W.loc = null
user.visible_message("<span class='notice'>[user] inserts a [W] into the [src]'s crystal port.</span>")
user.visible_message("<span class='notice'>[user] inserts [W] into \the [src]'s crystal slot.</span>")
else
..()
@@ -152,7 +152,7 @@
var/truePower = Clamp(power + power_off, 1, 1000)
var/trueRotation = rotation + rotation_off
var/trueAngle = Clamp(angle + angle_off, 1, 90)
var/trueAngle = Clamp(angle, 1, 90)
var/datum/projectile_data/proj_data = projectile_trajectory(telepad.x, telepad.y, trueRotation, trueAngle, truePower)
last_tele_data = proj_data
@@ -304,6 +304,6 @@
/obj/machinery/computer/telescience/proc/recalibrate()
teles_left = rand(30, 40)
angle_off = rand(-25, 25)
//angle_off = rand(-25, 25)
power_off = rand(-4, 0)
rotation_off = rand(-10, 10)