cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into to_chat

Browse Source 
Conflicts:
	code/game/machinery/door_control.dm
This commit is contained in:
Tigercat2000
2016-04-05 21:10:36 -07:00
parent bb5e3bca63 702ac3d367
commit dd79aaa967
21 changed files with 1125 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/mountable_frames/buttons_switches.dm
+23
View File
@@ -0,0 +1,23 @@
/obj/item/mounted/frame/driver_button
name = "mass driver button frame"
desc = "Used for repairing or building mass driver buttons"
icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt_frame"
mount_reqs = list("simfloor")
sheets_refunded = 1
/obj/item/mounted/frame/driver_button/do_build(turf/on_wall, mob/user)
new /obj/machinery/driver_button(get_turf(user), get_dir(user, on_wall))
qdel(src)
/obj/item/mounted/frame/light_switch
name = "light switch frame"
desc = "Used for repairing or building light switches"
icon = 'icons/obj/power.dmi'
icon_state = "light-p"
mount_reqs = list("simfloor", "nospace")
sheets_refunded = 1
/obj/item/mounted/frame/light_switch/do_build(turf/on_wall, mob/user)
new /obj/machinery/light_switch(get_turf(user), get_dir(user, on_wall))
qdel(src)
code/game/objects/items/mountable_frames/driver_button.dm
-10
View File
@@ -1,10 +0,0 @@
/obj/item/mounted/frame/driver_button
name = "mass driver button frame"
desc = "Used for repairing or building mass driver buttons"
icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt_frame"
mount_reqs = list("simfloor")
/obj/item/mounted/frame/driver_button/do_build(turf/on_wall, mob/user)
new /obj/machinery/driver_button(get_turf(user), get_dir(user, on_wall))
qdel(src)