cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
This commit is contained in:
Erthilo
2012-05-31 15:09:35 +01:00
parent b409a84f2d 28bc3fa766
commit 8e72965077
189 changed files with 2489 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/weapon/paper
name = "paper"
gender = PLURAL
code/modules/paperwork/paperbin.dm
+6 -5
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/item/weapon/paper_bin
name = "paper bin"
icon = 'bureaucracy.dmi'
@@ -8,10 +10,9 @@
throw_speed = 3
throw_range = 7
pressure_resistance = 10
var
amount = 30 //How much paper is in the bin.
list/papers = new/list() //List of papers put in the bin for reference.
sealed = 1 //If it's brandnew and unopened, it's sealed.
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.
var/sealed = 1 //If it's brandnew and unopened, it's sealed.
MouseDrop(mob/user as mob)
if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
@@ -86,4 +87,4 @@
if(amount < 1)
icon_state = "paper_bin0"
else
icon_state = "paper_bin1"
icon_state = "paper_bin1"
code/modules/paperwork/photocopier.dm
+7 -6
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/photocopier
name = "Photocopier"
icon = 'library.dmi'
@@ -8,11 +10,10 @@
idle_power_usage = 30
active_power_usage = 200
power_channel = EQUIP
var
obj/item/weapon/paper/copy = null //what's in the copier!
copies = 1 //how many copies to print!
toner = 30 //how much toner is left! woooooo~
maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
var/obj/item/weapon/paper/copy = null //what's in the copier!
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!
attack_ai(mob/user as mob)
return src.attack_hand(user)
@@ -132,4 +133,4 @@
/obj/item/device/toner
name = "toner cartridge"
icon_state = "tonercartridge"
icon_state = "tonercartridge"