mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
More emergency fixes
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
#define FISHING_RARE "rare"
|
||||
#define FISHING_UNCOMMON "uncommon"
|
||||
#define FISHING_COMMON "common"
|
||||
#define FISHING_JUNK "junk"
|
||||
#define FISHING_NOTHING "nothing"
|
||||
|
||||
GLOBAL_LIST_INIT(indoor_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNCOMMON = 20, FISHING_COMMON = 30, FISHING_JUNK = 5, FISHING_NOTHING = 50))
|
||||
GLOBAL_LIST_INIT(indoor_fishing_junk_list, list(
|
||||
/obj/random/junk = 15,
|
||||
@@ -17,8 +23,8 @@ GLOBAL_LIST_INIT(indoor_fishing_junk_list, list(
|
||||
fishing_loot = GLOB.indoor_fishing_chance_list
|
||||
|
||||
/turf/simulated/floor/water/deep/indoors
|
||||
min_fishing_time = 45
|
||||
max_fishing_time = 120
|
||||
min_fishing_time = 33
|
||||
max_fishing_time = 99
|
||||
|
||||
/turf/simulated/floor/water/deep/indoors/handle_fish()
|
||||
if(has_fish)
|
||||
@@ -27,3 +33,10 @@ GLOBAL_LIST_INIT(indoor_fishing_junk_list, list(
|
||||
common_fish_list = GLOB.generic_fishing_common_list
|
||||
junk_list = GLOB.indoor_fishing_junk_list
|
||||
fishing_loot = GLOB.indoor_fishing_chance_list
|
||||
|
||||
|
||||
#undef FISHING_RARE
|
||||
#undef FISHING_UNCOMMON
|
||||
#undef FISHING_COMMON
|
||||
#undef FISHING_JUNK
|
||||
#undef FISHING_NOTHING
|
||||
@@ -2683,9 +2683,12 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/security_lockerroom)
|
||||
"er" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/obj/machinery/shuttle_sensor{
|
||||
dir = 5;
|
||||
id_tag = "shuttlesens_exp";
|
||||
pixel_y = -6
|
||||
},
|
||||
/turf/simulated/wall/thull,
|
||||
/area/shuttle/excursion/tether)
|
||||
"es" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -2931,6 +2934,11 @@
|
||||
/obj/random/junk,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/station/ai)
|
||||
"eN" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/excursion/tether)
|
||||
"eS" = (
|
||||
/obj/item/frame,
|
||||
/obj/effect/floor_decal/rust,
|
||||
@@ -40540,7 +40548,7 @@ Zy
|
||||
WG
|
||||
dj
|
||||
XA
|
||||
er
|
||||
eN
|
||||
ms
|
||||
Oz
|
||||
be
|
||||
@@ -40682,7 +40690,7 @@ UJ
|
||||
Xb
|
||||
dj
|
||||
XN
|
||||
er
|
||||
eN
|
||||
ms
|
||||
Xq
|
||||
be
|
||||
@@ -40810,7 +40818,7 @@ bX
|
||||
cE
|
||||
cK
|
||||
fh
|
||||
ZB
|
||||
dj
|
||||
dW
|
||||
UB
|
||||
dj
|
||||
@@ -40824,7 +40832,7 @@ kn
|
||||
WS
|
||||
dj
|
||||
XN
|
||||
er
|
||||
eN
|
||||
ms
|
||||
Vb
|
||||
be
|
||||
@@ -41107,7 +41115,7 @@ jZ
|
||||
WR
|
||||
Xo
|
||||
XN
|
||||
er
|
||||
eN
|
||||
cK
|
||||
ms
|
||||
Xq
|
||||
@@ -41521,7 +41529,7 @@ cG
|
||||
VB
|
||||
WD
|
||||
dE
|
||||
dj
|
||||
er
|
||||
TY
|
||||
dj
|
||||
dj
|
||||
@@ -41675,7 +41683,7 @@ ea
|
||||
kx
|
||||
dj
|
||||
XN
|
||||
er
|
||||
eN
|
||||
cK
|
||||
ms
|
||||
mq
|
||||
@@ -41960,7 +41968,7 @@ kQ
|
||||
TG
|
||||
dj
|
||||
XN
|
||||
er
|
||||
eN
|
||||
ms
|
||||
nA
|
||||
be
|
||||
@@ -42102,7 +42110,7 @@ kR
|
||||
Vd
|
||||
dj
|
||||
XN
|
||||
er
|
||||
eN
|
||||
ms
|
||||
QL
|
||||
be
|
||||
@@ -42244,7 +42252,7 @@ ZE
|
||||
ZB
|
||||
dj
|
||||
XB
|
||||
er
|
||||
eN
|
||||
ms
|
||||
Sq
|
||||
be
|
||||
|
||||
Reference in New Issue
Block a user