shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ports n' Stuff (#65)

Browse Source 
* baykun

* spooky lavaland music

* deserted sound +  burger fix

* powertools

* forgot

* ex d

* atom support

* Revert "atom support"

This reverts commit 5c9790bfef97b3a5b3bf324950de6cbe91af71d9.

* ignore atom file for my setup

* oh whoops xd
This commit is contained in:
Somebody once told me the world is gonna roll me; I ain't the sharpest tool in the shed. She was looking kind of dumb with her finger and her thumb in the shape of an "L" on her forehead
2016-10-29 22:13:30 -04:00
committed by TalkingCactus
parent c78fddcf13
commit 9b07cb4798
64 changed files with 371 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera.dm
+2 -2
View File
@@ -126,7 +126,7 @@
return
user.electrocute_act(10, src)
/obj/machinery/camera/attackby(obj/W, mob/living/user, params)
/obj/machinery/camera/attackby(obj/item/W, mob/living/user, params)
var/msg = "<span class='notice'>You attach [W] into the assembly's inner circuits.</span>"
var/msg2 = "<span class='notice'>[src] already has that upgrade!</span>"
@@ -134,7 +134,7 @@
if(istype(W, /obj/item/weapon/screwdriver))
panel_open = !panel_open
user << "<span class='notice'>You screw the camera's panel [panel_open ? "open" : "closed"].</span>"
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
return
if(panel_open)
code/game/machinery/camera/camera_assembly.dm
+4 -4
View File
@@ -41,7 +41,7 @@
return
else if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You unattach the assembly from its place.</span>"
new /obj/item/wallframe/camera(get_turf(src))
qdel(src)
@@ -71,7 +71,7 @@
if(3)
// State 3
if(istype(W, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
var/input = stripped_input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
if(!input)
@@ -96,7 +96,7 @@
else if(istype(W, /obj/item/weapon/wirecutters))
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You cut the wires from the circuits.</span>"
state = 2
return
@@ -115,7 +115,7 @@
var/obj/U = locate(/obj) in upgrades
if(U)
user << "<span class='notice'>You unattach an upgrade from the assembly.</span>"
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
U.loc = get_turf(src)
upgrades -= U
return