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

Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights

Browse Source 
Attachable Seclite & Camera to Helmet
This commit is contained in:
Jordie
2015-03-22 16:56:11 +11:00
parent a67d8339b7 31c5e648f4
commit 94de5c997e
10 changed files with 219 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/security.dm
+1 -2
View File
@@ -181,8 +181,7 @@ Security Officer
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
// H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/sec(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store)
H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store)
code/game/machinery/bots/secbot.dm
+9 -2
View File
@@ -392,7 +392,14 @@ Auto Patrol: []"},
..()
return
if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
if(type != /obj/item/clothing/head/helmet/sec) //Eh, but we don't want people making secbots out of space helmets.
return
if(!helmetCam) //I am so sorry for this. I could not think of a less terrible (and lazy) way.
user << "[src] needs to have a camera attached first."
return
if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
user << "The mounted flashlight is in the way, remove it first."
return
if(S.secured)
@@ -458,7 +465,7 @@ Auto Patrol: []"},
else if(istype(I, /obj/item/weapon/screwdriver))
if(!build_step)
new /obj/item/device/assembly/signaler(get_turf(src))
new /obj/item/clothing/head/helmet(get_turf(src))
new /obj/item/clothing/head/helmet/sec(get_turf(src))
user << "<span class='notice'>You disconnect the signaler from the helmet.</span>"
qdel(src)
code/game/machinery/camera/camera.dm
+15
View File
@@ -331,3 +331,18 @@
return 1
busy = 0
return 0
/obj/machinery/camera/portable //Cameras which are placed inside of things, such as helmets.
var/turf/prev_turf
/obj/machinery/camera/portable/New()
..()
assembly.state = 0 //These cameras are portable, and so shall be in the portable state if removed.
assembly.anchored = 0
assembly.update_icon()
/obj/machinery/camera/portable/process() //Updates whenever the camera is moved.
if(cameranet && get_turf(src) != prev_turf)
cameranet.updatePortableCamera(src)
prev_turf = get_turf(src)