cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Organs:

Browse Source 
Moved into their own folder and got split into three files.
Damage  zones have been regrouped slightly to make it easier to deal with them. Currently the organ groups are head, l/r leg, l/r arm, and head.

Attacking:
Armor is properly checked.
Currently aiming for the chest gives a higher chance to stun whereas the head will stun for longer.
Stungloves/Disarm now show up in the attack log.
Stungloves ignore intent.

Silicon:
AI units can now move between cams that are not on the ss13 network.
Cyborg's alert screen should not longer pop up every time they get an alert if they have opened it once during the round.
Robot vision now uses the standard amount of energy.

Gamemodes:
Added Deuryn's unrev message.
Runes can only be examined if you are close to them.
Moved the Loyalty implants to the HoS' locker at the request of HerpA.
Nuke agents now come with explosive implants that will activate upon death.

Projectiles:
Once again went though the gun code and cleaned things up, it is much better now.
Bullet_act fixed up and most mobs now use the one in living, just overload it if they need to do something diff.
Freeze /caplaser/xbow no longer have an infinite loop.
Shotguns have to be pumped manually.

Went though the latest runtime log.

Power cells now use return on their give/use procs

Assemblies have been reworked and are nearly finished, just need to finish up the special assembly code, redo the signalers, and add one or two new assembly items.
Laying down will now only take 3 ticks to get up, from 5.

You can no longer punch people on the spawn screen.

This is a big one and was cleared by two heads, TK will only allow you to pick up items.  If you have an item in your hand it will act normal.

This revision got much larger than originally intended my tests show everything is working fine, but you never know.  Ill likely do more mob teaks in the next few days.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2333 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-08 10:38:01 +00:00
parent ad80137505
commit 62e28c2abf
148 changed files with 6638 additions and 8653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/bots/cleanbot.dm
+1 -1
View File
@@ -242,7 +242,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
if (prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
code/game/machinery/bots/ed209bot.dm
+10 -10
View File
@@ -688,7 +688,7 @@ Auto Patrol: []"},
Sa.build_step = 1
Sa.overlays += image('aibots.dmi', "hs_hole")
Sa.created_name = src.name
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
var/obj/item/weapon/melee/baton/B = new /obj/item/weapon/melee/baton(Tsec)
B.charges = 0
@@ -724,7 +724,7 @@ Auto Patrol: []"},
if (src.emagged)
A = new /obj/item/projectile/beam( loc )
else
A = new /obj/item/projectile/electrode( loc )
A = new /obj/item/projectile/energy/electrode( loc )
if (!( istype(U, /turf) ))
//A = null
@@ -786,7 +786,7 @@ Auto Patrol: []"},
/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if (((istype(W, /obj/item/robot_parts/l_leg)) || (istype(W, /obj/item/robot_parts/r_leg))) && (src.build_step == 0 || src.build_step == 1))
if(((istype(W, /obj/item/robot_parts/l_leg)) || (istype(W, /obj/item/robot_parts/r_leg))) && (src.build_step == 0 || src.build_step == 1))
src.build_step++
user << "You add the robot leg to [src]!"
src.name = "legs/frame assembly"
@@ -799,26 +799,26 @@ Auto Patrol: []"},
del(W)
else if (istype(W, /obj/item/clothing/suit/armor/vest) && (src.build_step == 2))
else if(istype(W, /obj/item/clothing/suit/armor/vest) && (src.build_step == 2))
src.build_step++
user << "You add the armor to [src]!"
src.name = "vest/legs/frame assembly"
src.item_state = "ed209_shell"
src.icon_state = "ed209_shell"
del(W)
else if ((istype(W, /obj/item/weapon/weldingtool) && W:welding) && (src.build_step == 3))
else if((istype(W, /obj/item/weapon/weldingtool) && W:welding) && (src.build_step == 3))
if (W:remove_fuel(0,user))
src.build_step++
src.name = "shielded frame assembly"
user << "You welded the vest to [src]!"
else if (istype(W, /obj/item/clothing/head/helmet) && (src.build_step == 4))
else if(istype(W, /obj/item/clothing/head/helmet) && (src.build_step == 4))
src.build_step++
user << "You add the helmet to [src]!"
src.name = "covered and shielded frame assembly"
src.item_state = "ed209_hat"
src.icon_state = "ed209_hat"
del(W)
else if (istype(W, /obj/item/device/prox_sensor) && (src.build_step == 5))
else if(isprox(W) && (src.build_step == 5))
src.build_step++
user << "You add the prox sensor to [src]!"
src.name = "prox/covered and armed the frame assembly"
@@ -835,7 +835,7 @@ Auto Patrol: []"},
src.build_step++
user << "\blue You wire the ED-209 assembly!"
src.name = "Wired ED-209 Assembly"
else if (istype(W, /obj/item/weapon/gun/energy/taser) && (src.build_step == 7))
else if(istype(W, /obj/item/weapon/gun/energy/taser) && (src.build_step == 7))
src.build_step++
user << "You add the taser gun to [src]!"
src.name = "Taser/Wired ED-209 Assembly"
@@ -851,7 +851,7 @@ Auto Patrol: []"},
src.build_step++
src.name = "Armed ED-209 Assembly"
user << "\blue Taser gun attached!"
else if ((istype(W, /obj/item/weapon/cell)) && (src.build_step >= 9))
else if((istype(W, /obj/item/weapon/cell)) && (src.build_step >= 9))
src.build_step++
user << "You complete the ED-209!"
var/obj/machinery/bot/ed209/S = new /obj/machinery/bot/ed209
@@ -860,7 +860,7 @@ Auto Patrol: []"},
del(W)
del(src)
else if (istype(W, /obj/item/weapon/pen))
else if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
if (!t)
code/game/machinery/bots/floorbot.dm
+2 -2
View File
@@ -347,7 +347,7 @@
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
N.contents = list()
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
if (prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
@@ -386,7 +386,7 @@
/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
..()
if(istype(W, /obj/item/device/prox_sensor))
if(isprox(W))
var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor
B.loc = user
if (user.r_hand == W)
code/game/machinery/bots/medbot.dm
+5 -5
View File
@@ -446,7 +446,7 @@
return
/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj)
if (Proj.flag == "taser")
if(Proj.flag == "taser")
src.stunned = min(stunned+10,20)
..()
@@ -463,7 +463,7 @@
new /obj/item/weapon/storage/firstaid(Tsec)
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
new /obj/item/device/healthanalyzer(Tsec)
@@ -568,14 +568,14 @@
/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if ((istype(W, /obj/item/device/healthanalyzer)) && (!src.build_step))
if((istype(W, /obj/item/device/healthanalyzer)) && (!src.build_step))
src.build_step++
user << "You add the health sensor to [src]!"
src.name = "First aid/robot arm/health analyzer assembly"
src.overlays += image('aibots.dmi', "na_scanner")
del(W)
else if ((istype(W, /obj/item/device/prox_sensor)) && (src.build_step == 1))
else if((isprox(W)) && (src.build_step == 1))
src.build_step++
user << "You complete the Medibot! Beep boop."
var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot
@@ -585,7 +585,7 @@
del(W)
del(src)
else if (istype(W, /obj/item/weapon/pen))
else if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
if (!t)
code/game/machinery/bots/mulebot.dm
+7 -9
View File
@@ -182,7 +182,6 @@
/obj/machinery/bot/mulebot/bullet_act()
if(prob(50) && !isnull(load))
load.bullet_act()
unload(0)
if(prob(25))
src.visible_message("\red Something shorts out inside [src]!")
@@ -794,13 +793,12 @@
*/
var/damage = rand(5,15)
H.TakeDamage("head", 2*damage, 0)
H.TakeDamage("chest",2*damage, 0)
H.TakeDamage("l_leg",0.5*damage, 0)
H.TakeDamage("r_leg",0.5*damage, 0)
H.TakeDamage("l_arm",0.5*damage, 0)
H.TakeDamage("r_arm",0.5*damage, 0)
H.apply_damage(2*damage, BRUTE, "head")
H.apply_damage(2*damage, BRUTE, "chest")
H.apply_damage(0.5*damage, BRUTE, "l_leg")
H.apply_damage(0.5*damage, BRUTE, "r_leg")
H.apply_damage(0.5*damage, BRUTE, "l_arm")
H.apply_damage(0.5*damage, BRUTE, "r_arm")
var/obj/effect/decal/cleanable/blood/B = new(src.loc)
B.blood_DNA = H.dna.unique_enzymes
@@ -950,7 +948,7 @@
src.visible_message("\red <B>[src] blows apart!</B>", 1)
var/turf/Tsec = get_turf(src)
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
new /obj/item/stack/rods(Tsec)
new /obj/item/stack/rods(Tsec)
new /obj/item/weapon/cable_coil/cut(Tsec)
code/game/machinery/bots/secbot.dm
+8 -8
View File
@@ -669,7 +669,7 @@ Auto Patrol: []"},
Sa.build_step = 1
Sa.overlays += image('aibots.dmi', "hs_hole")
Sa.created_name = src.name
new /obj/item/device/prox_sensor(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
var/obj/item/weapon/melee/baton/B = new /obj/item/weapon/melee/baton(Tsec)
B.charges = 0
@@ -697,16 +697,16 @@ Auto Patrol: []"},
//Secbot Construction
/obj/item/clothing/head/helmet/attackby(var/obj/item/device/radio/signaler/S, mob/user as mob)
/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob)
..()
if (!istype(S, /obj/item/device/radio/signaler))
if (!issignaler(S))
..()
return
if (src.type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
return
if (!S.b_stat)
if (!S.secured)
return
else
var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
@@ -731,21 +731,21 @@ Auto Patrol: []"},
src.overlays += image('aibots.dmi', "hs_hole")
user << "You weld a hole in [src]!"
else if ((istype(W, /obj/item/device/prox_sensor)) && (src.build_step == 1))
else if(isprox(W) && (src.build_step == 1))
src.build_step++
user << "You add the prox sensor to [src]!"
src.overlays += image('aibots.dmi', "hs_eye")
src.name = "helmet/signaler/prox sensor assembly"
del(W)
else if (((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2))
else if(((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2))
src.build_step++
user << "You add the robot arm to [src]!"
src.name = "helmet/signaler/prox sensor/robot arm assembly"
src.overlays += image('aibots.dmi', "hs_arm")
del(W)
else if ((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3))
else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3))
src.build_step++
user << "You complete the Securitron! Beep boop."
var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot
@@ -754,7 +754,7 @@ Auto Patrol: []"},
del(W)
del(src)
else if (istype(W, /obj/item/weapon/pen))
else if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
if (!t)