cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports fixes from Polaris early

Browse Source
This commit is contained in:
Heroman
2019-07-30 05:23:32 +10:00
parent 2ab5a99089
commit c82722cdbf
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_helpers/text.dm
View File

@@ -84,7 +84,6 @@
// 0 .. 9 // 0 .. 9
if(48 to 57) //Numbers if(48 to 57) //Numbers
if(!last_char_group) continue //suppress at start of string
if(!allow_numbers) continue // If allow_numbers is 0, then don't do this. if(!allow_numbers) continue // If allow_numbers is 0, then don't do this.
output += ascii2text(ascii_char) output += ascii2text(ascii_char)
number_of_alphanumeric++ number_of_alphanumeric++

19
code/game/mecha/equipment/tools/tools.dm
View File

@@ -166,14 +166,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
log_message("Drilled through [target]")
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)
@@ -219,7 +212,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)
@@ -267,13 +260,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)