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

[MIRROR] Fixes Archaeology not working (#2744)

Browse Source 
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
This commit is contained in:
CitadelStationBot
2017-09-13 16:53:30 -05:00
committed by Poojawa
parent c34b5c805f
commit 4da91bc330
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/item_attack.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/attackby(obj/item/I, mob/living/user, params) /obj/attackby(obj/item/I, mob/living/user, params)
return I.attack_obj(src, user) return I.attack_obj(src, user)
/mob/living/attackby(obj/item/I, mob/user, params) /mob/living/attackby(obj/item/I, mob/living/user, params)
user.changeNext_move(CLICK_CD_MELEE) user.changeNext_move(CLICK_CD_MELEE)
if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it? if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it?
var/sharpness = I.is_sharp() var/sharpness = I.is_sharp()
code/datums/components/archaeology.dm
+2 -2
View File
@@ -17,7 +17,7 @@
for(var/I in other_archdrops) for(var/I in other_archdrops)
_archdrops[I] += other_archdrops[I] _archdrops[I] += other_archdrops[I]
/datum/component/archaeology/proc/Dig(mob/user, obj/item/W) /datum/component/archaeology/proc/Dig(obj/item/W, mob/living/user)
if(dug) if(dug)
to_chat(user, "<span class='notice'>Looks like someone has dug here already.</span>") to_chat(user, "<span class='notice'>Looks like someone has dug here already.</span>")
return FALSE return FALSE
@@ -63,7 +63,7 @@
if(isplatingturf(OT)) if(isplatingturf(OT))
var/turf/open/floor/plating/POT = parent var/turf/open/floor/plating/POT = parent
POT.icon_plating = "[POT.postdig_icon]" POT.icon_plating = "[POT.postdig_icon]"
OT.icon_state = "[OT.postdig_icon]" POT.icon_state = "[OT.postdig_icon]"
if(OT.slowdown) //Things like snow slow you down until you dig them. if(OT.slowdown) //Things like snow slow you down until you dig them.
OT.slowdown = 0 OT.slowdown = 0
code/game/turfs/simulated/floor/plating.dm
+1 -3
View File
@@ -6,13 +6,11 @@
* Engine floor * Engine floor
* Foam plating * Foam plating
*/ */
// note that plating and engine floor do not call their parent attackby, unlike other flooring
// this is done in order to avoid inheriting the crowbar attackby
/turf/open/floor/plating /turf/open/floor/plating
name = "plating" name = "plating"
icon_state = "plating" icon_state = "plating"
intact = 0 intact = FALSE
/turf/open/floor/plating/Initialize() /turf/open/floor/plating/Initialize()
if (!broken_states) if (!broken_states)
code/game/turfs/simulated/floor/plating/asteroid.dm
+6
View File
@@ -35,6 +35,8 @@
return return
/turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params) /turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
if(..())
return TRUE
if(istype(W, /obj/item/storage/bag/ore)) if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1) if(S.collection_mode == 1)
@@ -62,6 +64,10 @@
return ..() return ..()
ChangeTurf(/turf/open/space) ChangeTurf(/turf/open/space)
/turf/open/floor/plating/asteroid/ex_act(severity, target)
. = SendSignal(COMSIG_ATOM_EX_ACT, severity, target)
contents_explosion(severity, target)
/turf/open/floor/plating/asteroid/basalt /turf/open/floor/plating/asteroid/basalt
name = "volcanic floor" name = "volcanic floor"