mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Seperated ID and PDA slots
This commit is contained in:
@@ -350,6 +350,16 @@
|
||||
if( !(slot_flags & SLOT_ID) )
|
||||
return 0
|
||||
return 1
|
||||
if(slot_wear_pda)
|
||||
if(H.wear_pda)
|
||||
return 0
|
||||
if(!H.w_uniform)
|
||||
if(!disable_warning)
|
||||
H << "\red You need a jumpsuit before you can attach this [name]."
|
||||
return 0
|
||||
if( !(slot_flags & SLOT_PDA) )
|
||||
return 0
|
||||
return 1
|
||||
if(slot_l_store)
|
||||
if(H.l_store)
|
||||
return 0
|
||||
|
||||
@@ -12,7 +12,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
item_state = "electronic"
|
||||
w_class = 1.0
|
||||
flags = FPRINT | TABLEPASS
|
||||
slot_flags = SLOT_ID | SLOT_BELT
|
||||
slot_flags = SLOT_BELT | SLOT_PDA
|
||||
|
||||
//Main variables
|
||||
var/owner = null
|
||||
|
||||
@@ -123,4 +123,9 @@
|
||||
icon_state = "cuff_white"
|
||||
|
||||
/obj/item/weapon/handcuffs/cyborg
|
||||
dispenser = 1
|
||||
dispenser = 1
|
||||
|
||||
/obj/item/weapon/handcuffs/pinkcuffs
|
||||
name = "fluffy pink handcuffs"
|
||||
desc = "Use this to keep prisoners in line. Or you know, your significant other."
|
||||
icon_state = "pinkcuffs"
|
||||
@@ -7,7 +7,7 @@
|
||||
density = 1
|
||||
|
||||
var/health = 100
|
||||
var/delay = 4 //Move delay to simulate a speed
|
||||
var/delay = 3 //Move delay to simulate a speed
|
||||
var/allowMove = 1
|
||||
var/datum/global_iterator/space_move //Handling space movement (i.e. drift forever)
|
||||
|
||||
|
||||
@@ -269,6 +269,7 @@
|
||||
|
||||
/obj/structure/table/attack_alien(mob/user)
|
||||
visible_message("<span class='danger'>[user] slices [src] apart!</span>")
|
||||
destroy()
|
||||
|
||||
/obj/structure/table/attack_animal(mob/living/simple_animal/user)
|
||||
if(user.wall_smash)
|
||||
@@ -416,6 +417,8 @@
|
||||
if (issilicon(usr))
|
||||
usr << "<span class='notice'>You need hands for this.</span>"
|
||||
return
|
||||
if (isobserver(usr))
|
||||
usr << "<span class='notice'>No haunting outside halloween.</span>n"
|
||||
if(!flip(get_cardinal_dir(usr,src)))
|
||||
usr << "<span class='notice'>It won't budge.</span>"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user