cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

Browse Source 
Removed the infra sensor, as it was buggy, and, to be perfectly honest, utterly pointless.
Slightly improved and moved dice code.

Fixes issue 366.
Fixes issue 317.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4555 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-08-26 22:44:04 +00:00
parent 474294466a
commit c14f242b4e
13 changed files with 173 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
code/modules/assembly/assembly.dm
View File

@@ -1,37 +1,3 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/proc/isassembly(O)
if(istype(O, /obj/item/device/assembly))
return 1
return 0
/proc/isigniter(O)
if(istype(O, /obj/item/device/assembly/igniter))
return 1
return 0
/proc/isinfared(O)
if(istype(O, /obj/item/device/assembly/infra))
return 1
return 0
/proc/isprox(O)
if(istype(O, /obj/item/device/assembly/prox_sensor))
return 1
return 0
/proc/issignaler(O)
if(istype(O, /obj/item/device/assembly/signaler))
return 1
return 0
/proc/istimer(O)
if(istype(O, /obj/item/device/assembly/timer))
return 1
return 0
/obj/item/device/assembly
name = "assembly"
desc = "A small electronic device that should never exist."
@@ -49,9 +15,7 @@
origin_tech = "magnets=1"
var/secured = 1
var/small_icon_state_left = null
var/small_icon_state_right = null
var/list/small_icon_state_overlays = null
var/list/attached_overlays = null
var/obj/item/device/assembly_holder/holder = null
var/cooldown = 0//To prevent spam
var/wires = WIRE_RECEIVE | WIRE_PULSE
@@ -130,7 +94,7 @@
attach_assembly(var/obj/item/device/assembly/A, var/mob/user)
holder = new/obj/item/device/assembly_holder(get_turf(src))
if(holder.attach(A,src,user))
user.show_message("\blue You attach the [A.name] to the [name]!")
user << "\blue You attach \the [A] to \the [src]!"
return 1
return 0
@@ -143,9 +107,9 @@
return
if(isscrewdriver(W))
if(toggle_secure())
user.show_message("\blue The [name] is ready!")
user << "\blue \The [src] is ready!"
else
user.show_message("\blue The [name] can now be attached!")
user << "\blue \The [src] can now be attached!"
return
..()
return
@@ -161,9 +125,9 @@
..()
if((in_range(src, usr) || loc == usr))
if(secured)
usr.show_message("The [name] is ready!")
usr << "\The [src] is ready!"
else
usr.show_message("The [name] can be attached!")
usr << "\The [src] can be attached!"
return
@@ -177,26 +141,6 @@
interact(mob/user as mob)
return //HTML MENU FOR WIRES GOES HERE
/*
Name: IsAssemblyHolder
Desc: If true is an object that can hold an assemblyholder object
*/
/obj/proc/IsAssemblyHolder()
return 0
/*
proc
Process_Activation(var/obj/D, var/normal = 1, var/special = 1)
*/
/*
Name: IsSpecialAssembly
Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door
*/
/obj/proc/IsSpecialAssembly()
return 0
/*
var/small_icon_state = null//If this obj will go inside the assembly use this for icons
var/list/small_icon_state_overlays = null//Same here