cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 21:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8612 from Spookerton/cerebulon/cassette-tape-path

Browse Source 
repath /tape to /cassette_tape & related map & list changes
This commit is contained in:
Sypsoti
2022-05-06 21:52:06 -05:00
committed by GitHub
parent e5302da83c afe8554c50
commit c326d99ec5
14 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/taperecorder.dm
+14 -14
View File
@@ -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")]"
code/game/objects/items/weapons/storage/belt.dm
+3 -3
View File
@@ -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
)
)
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -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,
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -1
View File
@@ -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"
code/modules/mob/living/silicon/robot/drone/drone_items.dm
+1 -1
View File
@@ -74,7 +74,7 @@
/obj/item/sample,
/obj/item/forensics/sample_kit,
/obj/item/taperecorder,
/obj/item/tape,
/obj/item/cassette_tape,
/obj/item/uv_light
)
maps/cynosure/cynosure-2.dmm
+9 -9
View File
@@ -6910,7 +6910,7 @@
/obj/machinery/recharger/wallcharger{
pixel_y = -28
},
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/megaphone,
/obj/structure/closet/secure_closet/hos/cynosure,
@@ -8709,7 +8709,7 @@
pixel_y = -6
},
/obj/item/handcuffs,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/turf/simulated/floor/carpet,
/area/surface/station/security/detectives_office)
"een" = (
@@ -9197,7 +9197,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals_central5{
dir = 4
},
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/turf/simulated/floor/tiled,
/area/surface/station/security/processing)
@@ -12100,7 +12100,7 @@
dir = 4
},
/obj/structure/table/standard,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/megaphone,
/obj/item/packageWrap,
@@ -14494,7 +14494,7 @@
/obj/structure/table/woodentable,
/obj/item/taperecorder,
/obj/item/book/codex/lore/news,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/turf/simulated/floor/wood,
/area/surface/station/library)
"gFo" = (
@@ -20537,10 +20537,10 @@
"jGo" = (
/obj/structure/table/woodentable,
/obj/item/taperecorder,
/obj/item/tape/random{
/obj/item/cassette_tape/random{
pixel_y = -2
},
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/camera,
/obj/item/barcodescanner,
/turf/simulated/floor/wood,
@@ -43355,7 +43355,7 @@
pixel_y = -6
},
/obj/item/handcuffs,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/turf/simulated/floor/carpet,
/area/surface/station/security/detectives_office)
"tCe" = (
@@ -50215,7 +50215,7 @@
pixel_y = -22
},
/obj/item/folder/red,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
maps/cynosure/cynosure-3.dmm
+6 -6
View File
@@ -4544,7 +4544,7 @@
dir = 4
},
/obj/structure/closet,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/camera{
pixel_x = 2;
@@ -19837,7 +19837,7 @@
"mMW" = (
/obj/structure/table/woodentable,
/obj/item/book/codex/corp_regs,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/turf/simulated/floor/carpet,
/area/surface/station/crew_quarters/captain)
@@ -20533,8 +20533,8 @@
/area/surface/station/maintenance/substation/security/snd)
"nod" = (
/obj/structure/table/standard,
/obj/item/tape/random,
/obj/item/tape/random{
/obj/item/cassette_tape/random,
/obj/item/cassette_tape/random{
pixel_y = -2
},
/obj/item/taperecorder,
@@ -20712,7 +20712,7 @@
pixel_x = 4;
pixel_y = 4
},
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/turf/simulated/floor/tiled,
/area/surface/station/security/prison)
@@ -22497,7 +22497,7 @@
},
/obj/item/paper_bin,
/obj/item/paicard,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/reagent_containers/food/drinks/jar,
/obj/structure/cable/green{
maps/cynosure/structures/closets/security.dm
+1 -1
View File
@@ -174,4 +174,4 @@
/obj/item/storage/briefcase/crimekit,
/obj/item/taperecorder,
/obj/item/storage/bag/detective,
/obj/item/tape/random = 3)
/obj/item/cassette_tape/random = 3)
maps/northern_star/polaris-1.dmm
+1 -2
View File
@@ -744,7 +744,7 @@
"aop" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/library)
"aoq" = (/obj/machinery/librarycomp{pixel_y = 0},/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/library)
"aor" = (/obj/machinery/libraryscanner,/turf/simulated/floor/wood,/area/library)
"aos" = (/obj/structure/table/woodentable,/obj/item/taperecorder{pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/item/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/obj/item/camera,/obj/item/tape,/turf/simulated/floor/carpet,/area/library)
"aos" = (/obj/structure/table/woodentable,/obj/item/taperecorder{pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/item/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/obj/item/camera,/obj/item/cassette_tape,/turf/simulated/floor/carpet,/area/library)
"aot" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen/invisible,/obj/item/clothing/under/suit_jacket/red,/obj/machinery/light,/obj/item/barcodescanner,/turf/simulated/floor/carpet,/area/library)
"aou" = (/obj/structure/table/rack,/obj/item/storage/firstaid/adv,/obj/item/bodybag/cryobag,/obj/item/tool/crowbar,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/sign/poster{pixel_y = 32},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard)
"aov" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard)
@@ -10175,4 +10175,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
maps/southern_cross/southern_cross-1.dmm
+14 -14
View File
@@ -25846,7 +25846,7 @@
"aYd" = (
/obj/structure/table/standard,
/obj/item/taperecorder,
/obj/item/tape,
/obj/item/cassette_tape,
/obj/item/megaphone,
/obj/item/packageWrap,
/obj/item/storage/box,
@@ -26962,7 +26962,7 @@
"aZS" = (
/obj/structure/table/steel,
/obj/item/newspaper,
/obj/item/tape,
/obj/item/cassette_tape,
/obj/item/taperecorder{
pixel_x = -4;
pixel_y = 2
@@ -29793,7 +29793,7 @@
/area/security/security_processing)
"beB" = (
/obj/structure/table/standard,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -33475,7 +33475,7 @@
},
/obj/item/handcuffs,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder{
pixel_x = -4;
pixel_y = 2
@@ -35390,7 +35390,7 @@
pixel_x = -4;
pixel_y = 8
},
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/megaphone,
/obj/item/radio/off,
@@ -36204,7 +36204,7 @@
/obj/structure/table/wooden_reinforced,
/obj/item/handcuffs,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder{
pixel_x = -4;
pixel_y = 2
@@ -42807,8 +42807,8 @@
/area/storage/auxillary)
"bBe" = (
/obj/structure/table/steel,
/obj/item/tape/random,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/obj/item/taperecorder,
/obj/structure/extinguisher_cabinet{
@@ -44413,7 +44413,7 @@
/obj/item/paicard{
pixel_x = 4
},
/obj/item/tape,
/obj/item/cassette_tape,
/obj/item/taperecorder{
pixel_x = -3
},
@@ -89491,8 +89491,8 @@
"djV" = (
/obj/structure/table/woodentable,
/obj/item/taperecorder,
/obj/item/tape/random,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/cassette_tape/random,
/obj/item/camera,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -90078,7 +90078,7 @@
/area/library)
"dlb" = (
/obj/structure/table/woodentable,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/turf/simulated/floor/wood,
/area/library)
@@ -93657,7 +93657,7 @@
/obj/structure/table/woodentable,
/obj/item/paper,
/obj/item/taperecorder,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -107397,7 +107397,7 @@
"dSo" = (
/obj/structure/table/woodentable,
/obj/item/book/codex/corp_regs,
/obj/item/tape/random,
/obj/item/cassette_tape/random,
/obj/item/taperecorder,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/sc/sd)
maps/submaps/surface_submaps/plains/lonehome.dmm
+1 -1
View File
@@ -34,7 +34,7 @@
"ld" = (/obj/machinery/power/port_gen/pacman,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome)
"lz" = (/obj/item/reagent_containers/glass/rag,/obj/item/clothing/gloves/ring/engagement,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lB" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/trash/plate,/obj/structure/table/sifwooden_reinforced,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome)
"lJ" = (/obj/item/tape,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lJ" = (/obj/item/cassette_tape,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lS" = (/obj/item/organ/internal/liver,/obj/random/trash,/turf/simulated/floor,/area/submap/lonehome)
"ma" = (/turf/simulated/wall/wood,/area/submap/lonehome)
"mn" = (/obj/item/clothing/mask/muzzle,/obj/random/trash,/turf/simulated/floor,/area/submap/lonehome)
maps/submaps/surface_submaps/plains/oldhotel.dmm
+1 -1
View File
@@ -69,7 +69,7 @@
"zP" = (/obj/random/plushie,/turf/simulated/floor/wood,/area/submap/oldhotel)
"Ac" = (/obj/structure/table/wooden_reinforced,/obj/item/material/knife/butch,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"AO" = (/obj/structure/railing,/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel)
"AU" = (/obj/structure/table/woodentable,/obj/item/tape,/turf/simulated/floor/wood,/area/submap/oldhotel)
"AU" = (/obj/structure/table/woodentable,/obj/item/cassette_tape,/turf/simulated/floor/wood,/area/submap/oldhotel)
"AZ" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/obj/item/paper{info = "This is a stupid tresure hunt task, that thing is not taking us anywhere. Go on and have fun finding a waste of time."; name = "Wrinkled sheet of paper"},/turf/simulated/floor/wood,/area/submap/oldhotel)
"Bt" = (/obj/structure/closet/cabinet,/obj/item/clothing/gloves/yellow,/obj/random/projectile/scrapped_pistol,/obj/random/junk,/obj/random/junk,/obj/random/junk,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance,/turf/simulated/floor/wood,/area/submap/oldhotel)
"Cx" = (/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel)