mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Improved creature AI and random mob spawning in caves.
Also equipment lockers. Conflicts: code/game/objects/items/weapons/cards_ids.dm code/modules/mining/materials.dm code/modules/mining/mine_turfs.dm code/modules/mining/ores_coins.dm code/modules/mob/living/simple_animal/hostile/mining_mobs.dm code/modules/projectiles/ammunition/bullets.dm code/modules/projectiles/guns/energy/special.dm compare_report_tg.txt icons/obj/device.dmi icons/obj/mining.dmi icons/obj/vehicles.dmi maps/tgstation.2.1.0.0.1.dmm maps/vgstation1.0.0.dmm
This commit is contained in:
@@ -125,8 +125,9 @@
|
||||
desc = "A card used to provide ID and determine access across the station."
|
||||
icon_state = "id"
|
||||
item_state = "card-id"
|
||||
var/list/access = list()
|
||||
var/registered_name = null // The name registered_name on the card
|
||||
var/mining_points = 0 //For redeeming at mining equipment lockers
|
||||
var/access = list()
|
||||
var/registered_name = "Unknown" // The name registered_name on the card
|
||||
slot_flags = SLOT_ID
|
||||
|
||||
var/blood_type = "\[UNSET\]"
|
||||
@@ -190,7 +191,8 @@
|
||||
/obj/item/weapon/card/id/attack_self(mob/user as mob)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)
|
||||
|
||||
if(mining_points)
|
||||
user << "There's [mining_points] mining equipment redemption points loaded onto this card."
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
@@ -368,4 +370,4 @@
|
||||
|
||||
/obj/item/weapon/card/id/prisoner/seven
|
||||
name = "Prisoner #13-007"
|
||||
registered_name = "Prisoner #13-007"
|
||||
registered_name = "Prisoner #13-007"
|
||||
|
||||
Reference in New Issue
Block a user