mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-26 14:46:52 +01:00
repath /tape to /cassette_tape & map/list updates
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
var/recording = 0.0
|
||||
var/playing = 0.0
|
||||
var/playsleepseconds = 0.0
|
||||
var/obj/item/tape/mytape = /obj/item/tape/random
|
||||
var/obj/item/cassette_tape/mytape = /obj/item/cassette_tape/random
|
||||
var/canprint = 1
|
||||
slot_flags = SLOT_BELT
|
||||
throwforce = 2
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
|
||||
/obj/item/taperecorder/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/tape))
|
||||
if(istype(I, /obj/item/cassette_tape))
|
||||
if(mytape)
|
||||
to_chat(user, "<span class='notice'>There's already a tape inside.</span>")
|
||||
return
|
||||
@@ -358,8 +358,8 @@
|
||||
|
||||
|
||||
|
||||
/obj/item/tape
|
||||
name = "tape"
|
||||
/obj/item/cassette_tape
|
||||
name = "cassette tape"
|
||||
desc = "A magnetic tape that can hold up to ten minutes of content."
|
||||
icon = 'icons/obj/device.dmi'
|
||||
pickup_sound = 'sound/items/pickup/device.ogg'
|
||||
@@ -377,43 +377,43 @@
|
||||
var/ruined = 0
|
||||
|
||||
|
||||
/obj/item/tape/update_icon()
|
||||
/obj/item/cassette_tape/update_icon()
|
||||
cut_overlays()
|
||||
if(ruined)
|
||||
add_overlay("ribbonoverlay")
|
||||
|
||||
|
||||
/obj/item/tape/fire_act()
|
||||
/obj/item/cassette_tape/fire_act()
|
||||
ruin()
|
||||
|
||||
/obj/item/tape/attack_self(mob/user)
|
||||
/obj/item/cassette_tape/attack_self(mob/user)
|
||||
if(!ruined)
|
||||
to_chat(user, "<span class='notice'>You pull out all the tape!</span>")
|
||||
ruin()
|
||||
|
||||
|
||||
/obj/item/tape/proc/ruin()
|
||||
/obj/item/cassette_tape/proc/ruin()
|
||||
ruined = 1
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/item/tape/proc/fix()
|
||||
/obj/item/cassette_tape/proc/fix()
|
||||
ruined = 0
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/item/tape/proc/record_speech(text)
|
||||
/obj/item/cassette_tape/proc/record_speech(text)
|
||||
timestamp += used_capacity
|
||||
storedinfo += "\[[time2text(used_capacity*10,"mm:ss")]\] [text]"
|
||||
|
||||
|
||||
//shows up on the printed transcript as (Unrecognized sound)
|
||||
/obj/item/tape/proc/record_noise(text)
|
||||
/obj/item/cassette_tape/proc/record_noise(text)
|
||||
timestamp += used_capacity
|
||||
storedinfo += "*\[[time2text(used_capacity*10,"mm:ss")]\] [text]"
|
||||
|
||||
|
||||
/obj/item/tape/attackby(obj/item/I, mob/user, params)
|
||||
/obj/item/cassette_tape/attackby(obj/item/I, mob/user, params)
|
||||
if(ruined && I.is_screwdriver())
|
||||
to_chat(user, "<span class='notice'>You start winding the tape back in...</span>")
|
||||
playsound(src, I.usesound, 50, 1)
|
||||
@@ -437,6 +437,6 @@
|
||||
|
||||
|
||||
//Random colour tapes
|
||||
/obj/item/tape/random/Initialize()
|
||||
/obj/item/cassette_tape/random/Initialize()
|
||||
. = ..()
|
||||
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
|
||||
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
/obj/item/flame/lighter,
|
||||
/obj/item/flashlight,
|
||||
/obj/item/taperecorder,
|
||||
/obj/item/tape,
|
||||
/obj/item/cassette_tape,
|
||||
/obj/item/pda,
|
||||
/obj/item/radio/headset,
|
||||
/obj/item/clothing/gloves,
|
||||
@@ -203,7 +203,7 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(
|
||||
/obj/item/taperecorder,
|
||||
/obj/item/tape,
|
||||
/obj/item/cassette_tape,
|
||||
/obj/item/clothing/glasses,
|
||||
/obj/item/flashlight,
|
||||
/obj/item/cell/device,
|
||||
@@ -462,4 +462,4 @@
|
||||
storage_slots = 8
|
||||
can_hold = list(
|
||||
/obj/item/ammo_casing/afoam_dart
|
||||
)
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
/obj/item/card,
|
||||
/obj/item/clothing/mask/smokable/cigarette/,
|
||||
/obj/item/flashlight/pen,
|
||||
/obj/item/tape,
|
||||
/obj/item/cassette_tape,
|
||||
/obj/item/cartridge,
|
||||
/obj/item/encryptionkey,
|
||||
/obj/item/seeds,
|
||||
|
||||
@@ -100,4 +100,4 @@
|
||||
/obj/item/clothing/glasses/sunglasses/big = 2,
|
||||
/obj/item/clothing/under/lawyer/blue = 2,
|
||||
/obj/item/clothing/under/lawyer/blue/skirt = 2,
|
||||
/obj/item/tape/random = 2)
|
||||
/obj/item/cassette_tape/random = 2)
|
||||
|
||||
@@ -222,7 +222,7 @@
|
||||
/obj/item/clipboard,
|
||||
/obj/item/folder/white,
|
||||
/obj/item/taperecorder,
|
||||
/obj/item/tape/random = 3,
|
||||
/obj/item/cassette_tape/random = 3,
|
||||
/obj/item/camera,
|
||||
/obj/item/toy/plushie/therapy/blue)
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
/obj/item/storage/briefcase/crimekit,
|
||||
/obj/item/taperecorder,
|
||||
/obj/item/storage/bag/detective,
|
||||
/obj/item/tape/random = 3)
|
||||
/obj/item/cassette_tape/random = 3)
|
||||
|
||||
/obj/structure/closet/secure_closet/injection
|
||||
name = "lethal injections locker"
|
||||
|
||||
Reference in New Issue
Block a user