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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera.dm
+22 -22
View File
@@ -89,7 +89,7 @@
network = list()
cameranet.removeCamera(src)
stat |= EMPED
SetLuminosity(0)
set_light(0)
emped = emped+1 //Increase the number of consecutive EMP's
update_icon()
var/thisemp = emped //Take note of which EMP this proc is for
@@ -108,7 +108,7 @@
if (O.client && O.client.eye == src)
O.unset_machine()
O.reset_perspective(null)
O << "The screen bursts into static."
to_chat(O, "The screen bursts into static.")
..()
/obj/machinery/camera/tesla_act(var/power)//EMP proof upgrade also makes it tesla immune
@@ -138,7 +138,7 @@
// DECONSTRUCTION
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>"
to_chat(user, "<span class='notice'>You screw the camera's panel [panel_open ? "open" : "closed"].</span>")
playsound(src.loc, W.usesound, 50, 1)
return
@@ -150,7 +150,7 @@
else if(istype(W, /obj/item/device/multitool)) //change focus
setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range))
user << "<span class='notice'>You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.</span>"
to_chat(user, "<span class='notice'>You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.</span>")
return
else if(istype(W, /obj/item/weapon/weldingtool))
@@ -165,27 +165,27 @@
return
upgradeXRay()
qdel(W)
user << "[msg]"
to_chat(user, "[msg]")
else
user << "[msg2]"
to_chat(user, "[msg2]")
return
else if(istype(W, /obj/item/stack/sheet/mineral/plasma))
if(!isEmpProof())
upgradeEmpProof()
user << "[msg]"
to_chat(user, "[msg]")
qdel(W)
else
user << "[msg2]"
to_chat(user, "[msg2]")
return
else if(istype(W, /obj/item/device/assembly/prox_sensor))
if(!isMotion())
upgradeMotion()
user << "[msg]"
to_chat(user, "[msg]")
qdel(W)
else
user << "[msg2]"
to_chat(user, "[msg2]")
return
// OTHER
@@ -204,7 +204,7 @@
P = W
itemname = P.name
info = P.notehtml
U << "<span class='notice'>You hold \the [itemname] up to the camera...</span>"
to_chat(U, "<span class='notice'>You hold \the [itemname] up to the camera...</span>")
U.changeNext_move(CLICK_CD_MELEE)
for(var/mob/O in player_list)
if(isAI(O))
@@ -212,25 +212,25 @@
if(AI.control_disabled || (AI.stat == DEAD))
return
if(U.name == "Unknown")
AI << "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ..."
to_chat(AI, "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
else
AI << "<b><a href='?src=\ref[AI];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ..."
to_chat(AI, "<b><a href='?src=\ref[AI];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
else if (O.client && O.client.eye == src)
O << "[U] holds \a [itemname] up to one of the cameras ..."
to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
O << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
return
else if(istype(W, /obj/item/device/camera_bug))
if(!can_use())
user << "<span class='notice'>Camera non-functional.</span>"
to_chat(user, "<span class='notice'>Camera non-functional.</span>")
return
if(bug)
user << "<span class='notice'>Camera bug removed.</span>"
to_chat(user, "<span class='notice'>Camera bug removed.</span>")
bug.bugged_cameras -= src.c_tag
bug = null
else
user << "<span class='notice'>Camera bugged.</span>"
to_chat(user, "<span class='notice'>Camera bugged.</span>")
bug = W
bug.bugged_cameras[src.c_tag] = src
return
@@ -280,7 +280,7 @@
if(can_use())
cameranet.addCamera(src)
else
SetLuminosity(0)
set_light(0)
cameranet.removeCamera(src)
cameranet.updateChunk(x, y, z)
var/change_msg = "deactivates"
@@ -305,7 +305,7 @@
if (O.client && O.client.eye == src)
O.unset_machine()
O.reset_perspective(null)
O << "The screen bursts into static."
to_chat(O, "The screen bursts into static.")
/obj/machinery/camera/proc/triggerCameraAlarm()
alarm_on = 1
@@ -374,7 +374,7 @@
if(!WT.remove_fuel(0, user))
return 0
user << "<span class='notice'>You start to weld [src]...</span>"
to_chat(user, "<span class='notice'>You start to weld [src]...</span>")
playsound(src.loc, WT.usesound, 50, 1)
busy = 1
if(do_after(user, 100*WT.toolspeed, target = src))
@@ -391,9 +391,9 @@
if(cam == src)
return
if(on)
src.SetLuminosity(AI_CAMERA_LUMINOSITY)
set_light(AI_CAMERA_LUMINOSITY)
else
src.SetLuminosity(0)
set_light(0)
/obj/machinery/camera/portable //Cameras which are placed inside of things, such as helmets.
var/turf/prev_turf
code/game/machinery/camera/camera_assembly.dm
+11 -11
View File
@@ -43,14 +43,14 @@
// State 1
if(istype(W, /obj/item/weapon/weldingtool))
if(weld(W, user))
user << "<span class='notice'>You weld the assembly securely into place.</span>"
to_chat(user, "<span class='notice'>You weld the assembly securely into place.</span>")
anchored = 1
state = 2
return
else if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You unattach the assembly from its place.</span>"
to_chat(user, "<span class='notice'>You unattach the assembly from its place.</span>")
new /obj/item/wallframe/camera(get_turf(src))
qdel(src)
return
@@ -60,17 +60,17 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.use(2))
user << "<span class='notice'>You add wires to the assembly.</span>"
to_chat(user, "<span class='notice'>You add wires to the assembly.</span>")
state = 3
else
user << "<span class='warning'>You need two lengths of cable to wire a camera!</span>"
to_chat(user, "<span class='warning'>You need two lengths of cable to wire a camera!</span>")
return
return
else if(istype(W, /obj/item/weapon/weldingtool))
if(weld(W, user))
user << "<span class='notice'>You unweld the assembly from its place.</span>"
to_chat(user, "<span class='notice'>You unweld the assembly from its place.</span>")
state = 1
anchored = 1
return
@@ -83,12 +83,12 @@
var/input = stripped_input(user, "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)
user << "<span class='warning'>No input found, please hang up and try your call again!</span>"
to_chat(user, "<span class='warning'>No input found, please hang up and try your call again!</span>")
return
var/list/tempnetwork = splittext(input, ",")
if(tempnetwork.len < 1)
user << "<span class='warning'>No network found, please hang up and try your call again!</span>"
to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
return
state = 4
@@ -105,7 +105,7 @@
else if(istype(W, /obj/item/weapon/wirecutters))
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You cut the wires from the circuits.</span>"
to_chat(user, "<span class='notice'>You cut the wires from the circuits.</span>")
state = 2
return
@@ -113,7 +113,7 @@
if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
if(!user.drop_item(W))
return
user << "<span class='notice'>You attach \the [W] into the assembly inner circuits.</span>"
to_chat(user, "<span class='notice'>You attach \the [W] into the assembly inner circuits.</span>")
upgrades += W
W.forceMove(src)
return
@@ -122,7 +122,7 @@
else if(istype(W, /obj/item/weapon/crowbar) && upgrades.len)
var/obj/U = locate(/obj) in upgrades
if(U)
user << "<span class='notice'>You unattach an upgrade from the assembly.</span>"
to_chat(user, "<span class='notice'>You unattach an upgrade from the assembly.</span>")
playsound(src.loc, W.usesound, 50, 1)
U.loc = get_turf(src)
upgrades -= U
@@ -133,7 +133,7 @@
/obj/structure/camera_assembly/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user)
if(!WT.remove_fuel(0, user))
return 0
user << "<span class='notice'>You start to weld \the [src]...</span>"
to_chat(user, "<span class='notice'>You start to weld \the [src]...</span>")
playsound(src.loc, WT.usesound, 50, 1)
if(do_after(user, 20*WT.toolspeed, target = src))
if(WT.isOn())
code/game/machinery/camera/tracking.dm
+4 -4
View File
@@ -93,11 +93,11 @@
U.tracking = 1
if(!target || !target.can_track(usr))
U << "<span class='warning'>Target is not near any active cameras.</span>"
to_chat(U, "<span class='warning'>Target is not near any active cameras.</span>")
U.cameraFollow = null
return
U << "<span class='notice'>Now tracking [target.get_visible_name()] on camera.</span>"
to_chat(U, "<span class='notice'>Now tracking [target.get_visible_name()] on camera.</span>")
var/cameraticks = 0
spawn(0)
@@ -108,11 +108,11 @@
if(!target.can_track(usr))
U.tracking = 1
if(!cameraticks)
U << "<span class='warning'>Target is not near any active cameras. Attempting to reacquire...</span>"
to_chat(U, "<span class='warning'>Target is not near any active cameras. Attempting to reacquire...</span>")
cameraticks++
if(cameraticks > 9)
U.cameraFollow = null
U << "<span class='warning'>Unable to reacquire, cancelling track...</span>"
to_chat(U, "<span class='warning'>Unable to reacquire, cancelling track...</span>")
tracking = 0
return
else