Merge pull request #746 from Datraen/TeleCrystal-Item2

Gives telecrystals tech levels, restores PDA default to new PDA.
This commit is contained in:
Neerti
2016-01-12 01:17:17 -07:00
4 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
slot_flags = SLOT_ID | SLOT_BELT
//Main variables
var/pdachoice = 3
var/pdachoice = 1
var/owner = null
var/default_cartridge = 0 // Access level defined by cartridge
var/obj/item/weapon/cartridge/cartridge = null //current cartridge
@@ -10,6 +10,7 @@ For new antags, make sure to add "player.mind.accept_tcrystals = 1" if you want
icon_state = "telecrystal"
item_state = "telecrystal"
force = 5
origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 1, TECH_ILLEGAL = 1)
/obj/item/device/telecrystal/attack_self(mob/user as mob)
if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals
+1 -1
View File
@@ -34,7 +34,7 @@ datum/preferences
var/undershirt //undershirt type
var/socks //socks type
var/backbag = 2 //backpack type
var/pdachoice = 3 //PDA type
var/pdachoice = 1 //PDA type
var/h_style = "Bald" //Hair type
var/r_hair = 0 //Hair color
var/g_hair = 0 //Hair color
+7
View File
@@ -0,0 +1,7 @@
author: Datraen
delete-after: True
changes:
- rscadd: "Telecrystal item now has tech values."