mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-04 22:52:03 +00:00
8961bd96d0
update_clothing() has been broken up into it's key parts. A full explanation can be found in code/modules/mob/living/carbon/human/update_icons.dm the tl;dr of it is that overlay updates are no longer called by the gameticker. Instead they are called by procs such as u_equip db_cick etc. This means faster updates (although admittedly, more of them can be called per tick). This however is offset by the fact that specific overlays can be updated now, vastly improving its efficiency. This will especially help when there are large numbers of dead mobs. Fixed the throw code for TKgrab so it can be toggled. Cloaking for aliens/humans/ninjas was changed. It's very crude at the moment and for that I apologise. But it works and is very efficient.It also stops cloaked individuals becomming invincible due to people being unable to hit them (even when they know exactly where they are) Fixed a bunch of bugs with damage-overlays. They were updating FAR FAR to frequently. They were also horribly inefficient. They should now be virtually seamless when updating and only use cached icons, so they aren't affected by lag as badly. This may help with explosions lag a little. There's still a tonne of stuff I need to refine with this. I'll be refining it down into some helper procs to reduce on code duplication and such git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3811 316c924e-a436-60f5-8080-3fe189b3f50e
275 lines
9.7 KiB
Plaintext
275 lines
9.7 KiB
Plaintext
/obj/mecha/combat
|
|
var/force = 30
|
|
var/damtype = "brute"
|
|
var/melee_cooldown = 10
|
|
var/melee_can_hit = 1
|
|
var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall)
|
|
internal_damage_threshold = 50
|
|
maint_access = 0
|
|
//add_req_access = 0
|
|
//operation_req_access = list(access_hos)
|
|
damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8)
|
|
var/am = "d3c2fbcadca903a41161ccc9df9cf948"
|
|
|
|
/*
|
|
/obj/mecha/combat/range_action(target as obj|mob|turf)
|
|
if(internal_damage&MECHA_INT_CONTROL_LOST)
|
|
target = pick(view(3,target))
|
|
if(selected_weapon)
|
|
selected_weapon.fire(target)
|
|
return
|
|
*/
|
|
|
|
/obj/mecha/combat/melee_action(target as obj|mob|turf)
|
|
if(internal_damage&MECHA_INT_CONTROL_LOST)
|
|
target = safepick(oview(1,src))
|
|
if(!melee_can_hit || !istype(target, /atom)) return
|
|
if(istype(target, /mob/living))
|
|
var/mob/living/M = target
|
|
if(src.occupant.a_intent == "hurt")
|
|
playsound(src, 'punch4.ogg', 50, 1)
|
|
if(damtype == "brute")
|
|
step_away(M,src,15)
|
|
/*
|
|
if(M.stat>1)
|
|
M.gib()
|
|
melee_can_hit = 0
|
|
if(do_after(melee_cooldown))
|
|
melee_can_hit = 1
|
|
return
|
|
*/
|
|
if(istype(target, /mob/living/carbon/human))
|
|
var/mob/living/carbon/human/H = target
|
|
// if (M.health <= 0) return
|
|
|
|
var/datum/organ/external/temp = H.get_organ(pick("chest", "chest", "chest", "head"))
|
|
if(temp)
|
|
var/update = 0
|
|
switch(damtype)
|
|
if("brute")
|
|
H.Paralyse(1)
|
|
update |= temp.take_damage(rand(force/2, force), 0)
|
|
if("fire")
|
|
update |= temp.take_damage(0, rand(force/2, force))
|
|
if("tox")
|
|
if(H.reagents)
|
|
if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2)
|
|
H.reagents.add_reagent("carpotoxin", force)
|
|
if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
|
|
H.reagents.add_reagent("cryptobiolin", force)
|
|
else
|
|
return
|
|
if(update) H.UpdateDamageIcon()
|
|
H.updatehealth()
|
|
|
|
else
|
|
switch(damtype)
|
|
if("brute")
|
|
M.Paralyse(1)
|
|
M.take_overall_damage(rand(force/2, force))
|
|
if("fire")
|
|
M.take_overall_damage(0, rand(force/2, force))
|
|
if("tox")
|
|
if(M.reagents)
|
|
if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2)
|
|
M.reagents.add_reagent("carpotoxin", force)
|
|
if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
|
|
M.reagents.add_reagent("cryptobiolin", force)
|
|
else
|
|
return
|
|
M.updatehealth()
|
|
src.occupant_message("You hit [target].")
|
|
src.visible_message("<font color='red'><b>[src.name] hits [target].</b></font>")
|
|
else
|
|
step_away(M,src)
|
|
src.occupant_message("You push [target] out of the way.")
|
|
src.visible_message("[src] pushes [target] out of the way.")
|
|
|
|
melee_can_hit = 0
|
|
if(do_after(melee_cooldown))
|
|
melee_can_hit = 1
|
|
return
|
|
|
|
else
|
|
if(damtype == "brute")
|
|
for(var/target_type in src.destroyable_obj)
|
|
if(istype(target, target_type) && hascall(target, "attackby"))
|
|
src.occupant_message("You hit [target].")
|
|
src.visible_message("<font color='red'><b>[src.name] hits [target]</b></font>")
|
|
if(!istype(target, /turf/simulated/wall))
|
|
target:attackby(src,src.occupant)
|
|
else if(prob(5))
|
|
target:dismantle_wall(1)
|
|
src.occupant_message("\blue You smash through the wall.")
|
|
src.visible_message("<b>[src.name] smashes through the wall</b>")
|
|
playsound(src, 'smash.ogg', 50, 1)
|
|
melee_can_hit = 0
|
|
if(do_after(melee_cooldown))
|
|
melee_can_hit = 1
|
|
break
|
|
return
|
|
|
|
/*
|
|
/obj/mecha/combat/proc/mega_shake(target)
|
|
if(!istype(target, /obj) && !istype(target, /mob)) return
|
|
if(istype(target, /mob))
|
|
var/mob/M = target
|
|
M.make_dizzy(3)
|
|
M.adjustBruteLoss(1)
|
|
M.updatehealth()
|
|
for (var/mob/V in viewers(src))
|
|
V.show_message("[src.name] shakes [M] like a rag doll.")
|
|
return
|
|
*/
|
|
|
|
/*
|
|
if(energy>0 && can_move)
|
|
if(step(src,direction))
|
|
can_move = 0
|
|
spawn(step_in) can_move = 1
|
|
if(overload)
|
|
energy = energy-2
|
|
health--
|
|
else
|
|
energy--
|
|
return 1
|
|
|
|
return 0
|
|
*/
|
|
/*
|
|
/obj/mecha/combat/hear_talk(mob/M as mob, text)
|
|
..()
|
|
if(am && M==occupant)
|
|
if(findtext(text,""))
|
|
sam()
|
|
return
|
|
|
|
/obj/mecha/combat/proc/sam()
|
|
if(am)
|
|
var/window = {"<html>
|
|
<head>
|
|
<style>
|
|
body {background:#000;color: #00ff00;font-family:"Courier",monospace;font-size:12px;}
|
|
#target {word-wrap: break-word;width:100%;padding-right:2px;}
|
|
#form {display:none;padding:0;margin:0;}
|
|
#input {background:#000;color: #00ff00;font-family:"Courier",monospace;border:none;padding:0;margin:0;width:90%;font-size:12px;}
|
|
</style>
|
|
<script type="text/javascript">
|
|
var text = "SGNL RCVD\\nTAG ANL :: STTS ACCPTD \\nINITSOC{buff:{128,0,NIL};p:'-zxf';stddev;inenc:'bin';outenc:'plain'}\\nSOD ->\\n0010101100101011001000000101010001101000011010010111001100100000011011010110000101100011011010000110100101101110011001010010000001101001011100110010000001100100011010010111001101100011011010000110000101110010011001110110010101100100001000000110100101101110011101000110111100100000011110010110111101110101011100100010000001100011011000010111001001100101001000000010101100101011000011010000101000101011001010110010000001000110011010010110011101101000011101000010000001110111011010010111010001101000001000000111010001101000011010010111001100100000011011010110000101100011011010000110100101101110011001010010110000100000011000010110111001100100001000000110011101110101011000010111001001100100001000000110100101110100001000000110011001110010011011110110110100100000011101000110100001100101001000000111001101101000011000010110110101100101001000000110111101100110001000000110010001100101011001100110010101100001011101000010000000101011001010110000110100001010001010110010101100100000010100110110010101110010011101100110010100100000011101000110100001101001011100110010000001101101011000010110001101101000011010010110111001100101001011000010000001100001011100110010000001111001011011110111010100100000011101110110111101110101011011000110010000100000011010000110000101110110011001010010000001100110011010010110011101101000011101000010000001101001011101000010000001100110011011110111001000100000011110010110111101110101001000000010101100101011\\n<- EOD\\nSOCFLUSH\\n";
|
|
var target_id = "target";
|
|
var form_id = "form";
|
|
var input_id = "input";
|
|
var delay=5;
|
|
var currentChar=0;
|
|
var inter;
|
|
var cur_el;
|
|
var maiden_el;
|
|
|
|
function type()
|
|
{
|
|
maiden_el = cur_el = document.getElementById(target_id);
|
|
if(cur_el && typeof(cur_el)!='undefined'){
|
|
inter = setInterval(function(){appendText(cur_el)},delay);
|
|
}
|
|
}
|
|
|
|
function appendText(el){
|
|
if(currentChar>text.length){
|
|
maiden_el.style.border = 'none';
|
|
clearInterval(inter);
|
|
var form = document.getElementById(form_id);
|
|
var input = document.getElementById(input_id);
|
|
if((form && typeof(form)!='undefined') && (input && typeof(input)!='undefined')){
|
|
form.style.display = 'block';
|
|
input.focus();
|
|
}
|
|
return;
|
|
}
|
|
var tchar = text.substr(currentChar, 1);
|
|
if(tchar=='\\n'){
|
|
el = cur_el = document.createElement('div');
|
|
maiden_el.appendChild(cur_el);
|
|
currentChar++;
|
|
return;
|
|
}
|
|
if(!el.firstChild){
|
|
var tNode=document.createTextNode(tchar);
|
|
el.appendChild(tNode);
|
|
}
|
|
else {
|
|
el.firstChild.nodeValue = el.firstChild.nodeValue+tchar
|
|
}
|
|
currentChar++;
|
|
}
|
|
|
|
function addSubmitEvent(form, input) {
|
|
input.onkeydown = function(e) {
|
|
e = e || window.event;
|
|
if (e.keyCode == 13) {
|
|
form.submit();
|
|
return false;
|
|
}
|
|
};
|
|
}
|
|
|
|
window.onload = function(){
|
|
var form = document.getElementById(form_id);
|
|
var input = document.getElementById(input_id);
|
|
if((!form || typeof(form)=='undefined') || (!input || typeof(input)=='undefined')){
|
|
return false;
|
|
}
|
|
addSubmitEvent(form,input);
|
|
type();
|
|
}
|
|
</script>
|
|
</head>
|
|
<body>
|
|
<div id="wrapper"><div id="target"></div>
|
|
<form id="form" name="form" action="byond://" method="get">
|
|
<label for="input">></label><input name="saminput" type="text" id="input" value="" />
|
|
<input type=\"hidden\" name=\"src\" value=\"\ref[src]\">
|
|
</form>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
"}
|
|
occupant << browse(window, "window=sam;size=800x600;")
|
|
onclose(occupant, "sam", src)
|
|
return
|
|
*/
|
|
/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob)
|
|
if(..())
|
|
if(H.client)
|
|
H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi")
|
|
return 1
|
|
else
|
|
return 0
|
|
|
|
/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
|
|
if(..())
|
|
if(occupant.client)
|
|
occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi")
|
|
return 1
|
|
else
|
|
return 0
|
|
|
|
|
|
/obj/mecha/combat/go_out()
|
|
if(src.occupant && src.occupant.client)
|
|
src.occupant.client.mouse_pointer_icon = initial(src.occupant.client.mouse_pointer_icon)
|
|
..()
|
|
return
|
|
|
|
/obj/mecha/combat/Topic(href,href_list)
|
|
..()
|
|
var/datum/topic_input/filter = new (href,href_list)
|
|
if(filter.get("close"))
|
|
am = null
|
|
return
|
|
/*
|
|
if(filter.get("saminput"))
|
|
if(md5(filter.get("saminput")) == am)
|
|
occupant_message("From the lies of the Antipath, Circuit preserve us.")
|
|
am = null
|
|
return
|
|
*/ |