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

Fixes mining borg ore box movement astral sorcery

Browse Source
This commit is contained in:
Atermonera
2020-02-16 22:17:19 -08:00
committed by VirgoBot
parent 106711b0f3
commit c5b6dfa259
5 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mining/mine_turfs.dm
View File

@@ -124,15 +124,6 @@ turf/simulated/mineral/floor/light_corner
if(air_master)
air_master.mark_for_update(src)
/turf/simulated/mineral/Entered(atom/movable/M as mob|obj)
. = ..()
if(istype(M,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = M
if(R.module)
for(var/obj/item/weapon/storage/bag/ore/O in list(R.module_state_1, R.module_state_2, R.module_state_3))
attackby(O, R)
return
/turf/simulated/mineral/proc/get_cached_border(var/cache_id, var/direction, var/icon_file, var/icon_state, var/offset = 32)
//Cache miss
if(!mining_overlay_cache["[cache_id]_[direction]"])

20
code/modules/mining/satchel_ore_boxdm.dm → code/modules/mining/ore_box.dm
View File

@@ -1,6 +1,5 @@
/**********************Ore box**************************/
//Why the hell is this file called satchel_ore_boxdm.dm? -CK
/obj/structure/ore_box
icon = 'icons/obj/mining.dmi'
icon_state = "orebox0"
@@ -41,11 +40,15 @@
/obj/structure/ore_box/examine(mob/user)
to_chat(user, "That's an [src].")
<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(user,desc)
// Borgs can now check contents too.
if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
return
=======
to_chat(user, desc)
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them.
return
@@ -70,11 +73,16 @@
set category = "Object"
set src in view(1)
<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
if(!istype(usr, /mob/living/carbon/human) && !istype(usr, /mob/living/silicon/robot)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
to_chat(usr, "<font color='red'>You are physically incapable of emptying the ore box.</font>")
=======
if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
to_chat(usr, "<span class='warning'>You are physically incapable of emptying the ore box.</span>")
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return
if( usr.stat || usr.restrained() )
if(usr.stat || usr.restrained())
return
if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
@@ -84,13 +92,21 @@
add_fingerprint(usr)
if(contents.len < 1)
<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(usr, "<font color='red'>The ore box is empty.</font>")
=======
to_chat(usr, "<span class='warning'>The ore box is empty.</span>")
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(usr, "<font color='blue'>You empty the ore box.</font>")
=======
to_chat(usr, "<span class='notice'>You empty the ore box.</span>")
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return