cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream PR

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-21 15:50:29 -04:00
parent 96c442dce7
commit 9837da24bb
2 changed files with 1 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/modules/paperwork/photocopier.dm
View File

@@ -70,7 +70,6 @@
break break
if (istype(copyitem, /obj/item/weapon/paper)) if (istype(copyitem, /obj/item/weapon/paper))
<<<<<<< HEAD
playsound(src, "sound/machines/copier.ogg", 100, 1) playsound(src, "sound/machines/copier.ogg", 100, 1)
sleep(11) sleep(11)
copy(copyitem) copy(copyitem)
@@ -100,29 +99,6 @@
else else
to_chat(user, "<span class='warning'>\The [copyitem] can't be copied by [src].</span>") to_chat(user, "<span class='warning'>\The [copyitem] can't be copied by [src].</span>")
playsound(src, "sound/machines/buzz-two.ogg", 100) playsound(src, "sound/machines/buzz-two.ogg", 100)
=======
playsound(loc, "sound/machines/copier.ogg", 100, 1)
sleep(11)
copy(copyitem)
audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>")
playsound(loc, "sound/machines/buzzbeep.ogg", 30)
else if (istype(copyitem, /obj/item/weapon/photo))
playsound(loc, "sound/machines/copier.ogg", 100, 1)
sleep(11)
photocopy(copyitem)
audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>")
playsound(loc, "sound/machines/buzzbeep.ogg", 30)
else if (istype(copyitem, /obj/item/weapon/paper_bundle))
sleep(11)
playsound(loc, "sound/machines/copier.ogg", 100, 1)
var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
sleep(11*B.pages.len)
audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>")
playsound(loc, "sound/machines/buzzbeep.ogg", 30)
else
to_chat(user, "<span class='warning'>\The [copyitem] can't be copied by [src].</span>")
playsound(loc, "sound/machines/buzz-two.ogg", 100)
>>>>>>> d2d67d6... Merge pull request #7153 from Rykka-Stormheart/shep-dev-photocopier-improvements
break break
use_power(active_power_usage) use_power(active_power_usage)
@@ -256,11 +232,7 @@
if(need_toner) if(need_toner)
toner-- toner--
if(toner == 0) if(toner == 0)
<<<<<<< HEAD
playsound(src, "sound/machines/buzz-sigh.ogg", 100) playsound(src, "sound/machines/buzz-sigh.ogg", 100)
=======
playsound(loc, "sound/machines/buzz-sigh.ogg", 100)
>>>>>>> d2d67d6... Merge pull request #7153 from Rykka-Stormheart/shep-dev-photocopier-improvements
visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>") visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>")
return c return c
@@ -283,11 +255,7 @@
toner -= 5 //photos use a lot of ink! toner -= 5 //photos use a lot of ink!
if(toner < 0) if(toner < 0)
toner = 0 toner = 0
<<<<<<< HEAD
playsound(src, "sound/machines/buzz-sigh.ogg", 100) playsound(src, "sound/machines/buzz-sigh.ogg", 100)
=======
playsound(loc, "sound/machines/buzz-sigh.ogg", 100)
>>>>>>> d2d67d6... Merge pull request #7153 from Rykka-Stormheart/shep-dev-photocopier-improvements
visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>") visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>")
return p return p
@@ -383,11 +351,7 @@
for(var/obj/item/weapon/W in bundle.pages) for(var/obj/item/weapon/W in bundle.pages)
if(toner <= 0 && need_toner) if(toner <= 0 && need_toner)
toner = 0 toner = 0
<<<<<<< HEAD
playsound(src, "sound/machines/buzz-sigh.ogg", 100) playsound(src, "sound/machines/buzz-sigh.ogg", 100)
=======
playsound(loc, "sound/machines/buzz-sigh.ogg", 100)
>>>>>>> d2d67d6... Merge pull request #7153 from Rykka-Stormheart/shep-dev-photocopier-improvements
visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>") visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>")
break break

6
nano/templates/photocopier.tmpl
View File

@@ -3,11 +3,7 @@
See: code/modules/paperwork/photocopier.dm See: code/modules/paperwork/photocopier.dm
--> -->
<<<<<<< HEAD {{if data.copyItem || data.assPresent}} <!-- VOREStation Add for ass copying -->
{{if data.copyItem || data.assPresent}}
=======
{{if data.copyItem}}
>>>>>>> d2d67d6... Merge pull request #7153 from Rykka-Stormheart/shep-dev-photocopier-improvements
<div class='item'> <div class='item'>
{{:helper.link('Remove Item', 'eject', {'remove' : 1})}} {{:helper.link('Remove Item', 'eject', {'remove' : 1})}}
{{if data.toner}} {{if data.toner}}