cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors from ticker initializing after map ore

Browse Source 
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level).  The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.

This also means that ore mined on the Clown Planet don't count.
This commit is contained in:
Regory
2014-08-04 16:24:00 -04:00
parent 109754ac2b
commit ce7d05ccf3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore.dm
+1 -2
View File
@@ -78,8 +78,7 @@
/obj/item/weapon/ore/New()
pixel_x = rand(0,16)-8
pixel_y = rand(0,8)-8
if(ticker.current_state == GAME_STATE_PLAYING) score_oremined++ //When ore spawns, increment score. Ignore ores that spawn with map before game starts.
if(src.z == 5) score_oremined++ //When ore spawns, increment score. Only include ore spawned on mining asteroid (No Clown Planet)
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/device/core_sampler))