Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds an upgraded photocopier for the CL and CC #6126

Merged
merged 26 commits into from
Apr 21, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cd7a2a3
P.S.1
LC4492 Apr 9, 2024
52ceac4
Merge branch 'master' into Photocopying
LC4492 Apr 9, 2024
d6f963d
Merge branch 'master' into Photocopying
LC4492 Apr 10, 2024
975f4c7
Merge branch 'master' into Photocopying
LC4492 Apr 11, 2024
7f8aff9
Merge branch 'master' into Photocopying
LC4492 Apr 13, 2024
d95abaf
P.S.2
LC4492 Apr 14, 2024
4e87500
Merge branch 'Photocopying' of https://github.com/LC4492/CM-Space-Sta…
LC4492 Apr 14, 2024
b7068ee
Merge branch 'master' into Photocopying
LC4492 Apr 14, 2024
36fe134
Merge branch 'master' into Photocopying
LC4492 Apr 15, 2024
3c51ed7
Merge branch 'master' into Photocopying
LC4492 Apr 15, 2024
308f18e
Merge branch 'master' into Photocopying
LC4492 Apr 19, 2024
65ae424
P.S.3
LC4492 Apr 19, 2024
4eb12cf
P.S.4
LC4492 Apr 19, 2024
72e1501
Merge branch 'Photocopying' of https://github.com/LC4492/CM-Space-Sta…
LC4492 Apr 19, 2024
0a739b1
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
4d822b9
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
ff4e1a5
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
6bd5b59
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
58bbc8a
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
eb87a66
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 20, 2024
4160ea7
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 21, 2024
17404fa
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 21, 2024
60e5c67
Update code/modules/paperwork/photocopier.dm
LC4492 Apr 21, 2024
a6b7cce
P.S.5
LC4492 Apr 21, 2024
5541f33
P.S.6
LC4492 Apr 21, 2024
f64846e
Update code/modules/paperwork/photocopier.dm
Drulikar Apr 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions code/modules/paperwork/photocopier.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/// Normal Photocopier, made by Seegson
/obj/structure/machinery/photocopier
name = "photocopier"
icon = 'icons/obj/structures/machinery/library.dmi'
icon_state = "bigscanner"
desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Seegson in a cheaper frame than most modern photocopiers. It uses more primitive copying technology resulting in more toner waste and less printing capabilities. Nonetheless, its cheap construction means cheaper costs, and for people that only need to print a paper or two most of the time, it becomes cost-effective."
anchored = TRUE
density = TRUE
use_power = USE_POWER_IDLE
Expand All @@ -11,9 +13,15 @@
var/obj/item/paper/copy = null //what's in the copier!
var/obj/item/photo/photocopy = null
var/obj/item/paper_bundle/bundle = null
var/copies = 1 //how many copies to print!
var/toner = 30 //how much toner is left! woooooo~
var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
///how many copies to print!
var/copies = 1
//how much toner is left! woooooo~
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
var/toner = 45
///how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
var/maxcopies = 10
///the flick state to use when inserting paper into the machine
var/animate_state = "bigscanner1"


/obj/structure/machinery/photocopier/attack_remote(mob/user as mob)
return attack_hand(user)
Expand Down Expand Up @@ -116,7 +124,7 @@
if(user.drop_inv_item_to_loc(O, src))
copy = O
to_chat(user, SPAN_NOTICE("You insert the paper into \the [src]."))
flick("bigscanner1", src)
flick(animate_state, src)
updateUsrDialog()
else
to_chat(user, SPAN_NOTICE("There is already something in \the [src]."))
Expand All @@ -125,7 +133,7 @@
if(user.drop_inv_item_to_loc(O, src))
photocopy = O
to_chat(user, SPAN_NOTICE("You insert the photo into \the [src]."))
flick("bigscanner1", src)
flick(animate_state, src)
updateUsrDialog()
else
to_chat(user, SPAN_NOTICE("There is already something in \the [src]."))
Expand All @@ -134,13 +142,13 @@
if(user.drop_inv_item_to_loc(O, src))
bundle = O
to_chat(user, SPAN_NOTICE("You insert the bundle into \the [src]."))
flick("bigscanner1", src)
flick(animate_state, src)
updateUsrDialog()
else if(istype(O, /obj/item/device/toner))
if(toner == 0)
if(user.temp_drop_inv_item(O))
qdel(O)
toner = 30
toner = initial(toner)
to_chat(user, SPAN_NOTICE("You insert the toner cartridge into \the [src]."))
updateUsrDialog()
else
Expand Down Expand Up @@ -239,6 +247,21 @@
return p


/// Upgraded photocopier, straight upgrade from the normal photocopier, made by Weyland-Yutani
/obj/structure/machinery/photocopier/wyphotocopier
name = "photocopier"
icon = 'icons/obj/structures/machinery/library.dmi'
icon_state = "bigscannerpro"
desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Weyland-Yutani in a more modern and robust frame than the average photocopiers you see from smaller companies. It uses some of the most advanced technologies in the area of paper-printing such as bigger toner economy and much higher printing capabilities. All that makes it the favorite among consumers that need to print high amounts of paperwork for their daily duties."
idle_power_usage = 50
active_power_usage = 300
copies = 1
toner = 180
maxcopies = 30
animate_state = "bigscannerpro1"


/// The actual toner cartridge used in photcopiers
/obj/item/device/toner
name = "toner cartridge"
icon_state = "tonercartridge"
Binary file modified icons/obj/structures/machinery/library.dmi
Binary file not shown.
6 changes: 2 additions & 4 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -56403,10 +56403,10 @@
},
/area/almayer/living/briefing)
"phj" = (
/obj/structure/machinery/photocopier,
/obj/structure/machinery/light/small{
dir = 1
},
/obj/structure/machinery/photocopier/wyphotocopier,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -69589,12 +69589,10 @@
/obj/structure/machinery/light{
dir = 1
},
/obj/structure/machinery/photocopier{
anchored = 0
},
/obj/structure/sign/poster/art{
pixel_y = 32
},
/obj/structure/machinery/photocopier/wyphotocopier,
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliaison)
"tHk" = (
Expand Down
Loading